projects
/
profile
/
ivi
/
qtxmlpatterns.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cc51c29
)
Change copyrights from Nokia to Digia
author
Iikka Eklund
<iikka.eklund@digia.com>
Mon, 24 Sep 2012 07:07:03 +0000
(10:07 +0300)
committer
The Qt Project
<gerrit-noreply@qt-project.org>
Mon, 24 Sep 2012 07:12:04 +0000
(09:12 +0200)
Change copyrights and license headers from Nokia to Digia
Change-Id: I34508f293d75832657f79479e2a8c184e873e154
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
907 files changed:
doc/global/qt-html-templates-offline.qdocconf
patch
|
blob
|
history
doc/qt5.qdocconf
patch
|
blob
|
history
doc/src/examples/filetree.qdoc
patch
|
blob
|
history
doc/src/examples/globalVariables.qdoc
patch
|
blob
|
history
doc/src/examples/recipes.qdoc
patch
|
blob
|
history
doc/src/examples/schema.qdoc
patch
|
blob
|
history
doc/src/examples/trafficinfo.qdoc
patch
|
blob
|
history
doc/src/snippets/code/doc_src_qtxmlpatterns.qdoc
patch
|
blob
|
history
doc/src/snippets/code/src_xmlpatterns_api_qabstracturiresolver.cpp
patch
|
blob
|
history
doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlforwarditerator.cpp
patch
|
blob
|
history
doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlnodemodel.cpp
patch
|
blob
|
history
doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlreceiver.cpp
patch
|
blob
|
history
doc/src/snippets/code/src_xmlpatterns_api_qsimplexmlnodemodel.cpp
patch
|
blob
|
history
doc/src/snippets/code/src_xmlpatterns_api_qxmlformatter.cpp
patch
|
blob
|
history
doc/src/snippets/code/src_xmlpatterns_api_qxmlname.cpp
patch
|
blob
|
history
doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp
patch
|
blob
|
history
doc/src/snippets/code/src_xmlpatterns_api_qxmlresultitems.cpp
patch
|
blob
|
history
doc/src/snippets/code/src_xmlpatterns_api_qxmlserializer.cpp
patch
|
blob
|
history
doc/src/snippets/qxmlquery/bindingExample.cpp
patch
|
blob
|
history
doc/src/snippets/qxmlschema/main.cpp
patch
|
blob
|
history
doc/src/snippets/qxmlschemavalidator/main.cpp
patch
|
blob
|
history
doc/src/xml-processing/xml-patterns.qdoc
patch
|
blob
|
history
doc/src/xml-processing/xquery-introduction.qdoc
patch
|
blob
|
history
examples/xmlpatterns/filetree/filetree.cpp
patch
|
blob
|
history
examples/xmlpatterns/filetree/filetree.h
patch
|
blob
|
history
examples/xmlpatterns/filetree/main.cpp
patch
|
blob
|
history
examples/xmlpatterns/filetree/mainwindow.cpp
patch
|
blob
|
history
examples/xmlpatterns/filetree/mainwindow.h
patch
|
blob
|
history
examples/xmlpatterns/recipes/main.cpp
patch
|
blob
|
history
examples/xmlpatterns/recipes/querymainwindow.cpp
patch
|
blob
|
history
examples/xmlpatterns/recipes/querymainwindow.h
patch
|
blob
|
history
examples/xmlpatterns/schema/main.cpp
patch
|
blob
|
history
examples/xmlpatterns/schema/mainwindow.cpp
patch
|
blob
|
history
examples/xmlpatterns/schema/mainwindow.h
patch
|
blob
|
history
examples/xmlpatterns/shared/xmlsyntaxhighlighter.cpp
patch
|
blob
|
history
examples/xmlpatterns/shared/xmlsyntaxhighlighter.h
patch
|
blob
|
history
examples/xmlpatterns/trafficinfo/main.cpp
patch
|
blob
|
history
examples/xmlpatterns/trafficinfo/mainwindow.cpp
patch
|
blob
|
history
examples/xmlpatterns/trafficinfo/mainwindow.h
patch
|
blob
|
history
examples/xmlpatterns/trafficinfo/stationdialog.cpp
patch
|
blob
|
history
examples/xmlpatterns/trafficinfo/stationdialog.h
patch
|
blob
|
history
examples/xmlpatterns/trafficinfo/stationquery.cpp
patch
|
blob
|
history
examples/xmlpatterns/trafficinfo/stationquery.h
patch
|
blob
|
history
examples/xmlpatterns/trafficinfo/timequery.cpp
patch
|
blob
|
history
examples/xmlpatterns/trafficinfo/timequery.h
patch
|
blob
|
history
examples/xmlpatterns/xquery/globalVariables/globals.cpp
patch
|
blob
|
history
src/xmlpatterns/Mainpage.dox
patch
|
blob
|
history
src/xmlpatterns/acceltree/qacceliterators.cpp
patch
|
blob
|
history
src/xmlpatterns/acceltree/qacceliterators_p.h
patch
|
blob
|
history
src/xmlpatterns/acceltree/qacceltree.cpp
patch
|
blob
|
history
src/xmlpatterns/acceltree/qacceltree_p.h
patch
|
blob
|
history
src/xmlpatterns/acceltree/qacceltreebuilder_p.h
patch
|
blob
|
history
src/xmlpatterns/acceltree/qacceltreebuilder_tpl_p.h
patch
|
blob
|
history
src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp
patch
|
blob
|
history
src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h
patch
|
blob
|
history
src/xmlpatterns/acceltree/qcompressedwhitespace.cpp
patch
|
blob
|
history
src/xmlpatterns/acceltree/qcompressedwhitespace_p.h
patch
|
blob
|
history
src/xmlpatterns/api/qabstractmessagehandler.cpp
patch
|
blob
|
history
src/xmlpatterns/api/qabstractmessagehandler.h
patch
|
blob
|
history
src/xmlpatterns/api/qabstracturiresolver.cpp
patch
|
blob
|
history
src/xmlpatterns/api/qabstracturiresolver.h
patch
|
blob
|
history
src/xmlpatterns/api/qabstractxmlforwarditerator.cpp
patch
|
blob
|
history
src/xmlpatterns/api/qabstractxmlforwarditerator_p.h
patch
|
blob
|
history
src/xmlpatterns/api/qabstractxmlnodemodel.cpp
patch
|
blob
|
history
src/xmlpatterns/api/qabstractxmlnodemodel.h
patch
|
blob
|
history
src/xmlpatterns/api/qabstractxmlnodemodel_p.h
patch
|
blob
|
history
src/xmlpatterns/api/qabstractxmlpullprovider.cpp
patch
|
blob
|
history
src/xmlpatterns/api/qabstractxmlpullprovider_p.h
patch
|
blob
|
history
src/xmlpatterns/api/qabstractxmlreceiver.cpp
patch
|
blob
|
history
src/xmlpatterns/api/qabstractxmlreceiver.h
patch
|
blob
|
history
src/xmlpatterns/api/qabstractxmlreceiver_p.h
patch
|
blob
|
history
src/xmlpatterns/api/qcoloringmessagehandler.cpp
patch
|
blob
|
history
src/xmlpatterns/api/qcoloringmessagehandler_p.h
patch
|
blob
|
history
src/xmlpatterns/api/qcoloroutput.cpp
patch
|
blob
|
history
src/xmlpatterns/api/qcoloroutput_p.h
patch
|
blob
|
history
src/xmlpatterns/api/qdeviceresourceloader_p.h
patch
|
blob
|
history
src/xmlpatterns/api/qiodevicedelegate.cpp
patch
|
blob
|
history
src/xmlpatterns/api/qiodevicedelegate_p.h
patch
|
blob
|
history
src/xmlpatterns/api/qnetworkaccessdelegator.cpp
patch
|
blob
|
history
src/xmlpatterns/api/qnetworkaccessdelegator_p.h
patch
|
blob
|
history
src/xmlpatterns/api/qpullbridge.cpp
patch
|
blob
|
history
src/xmlpatterns/api/qpullbridge_p.h
patch
|
blob
|
history
src/xmlpatterns/api/qreferencecountedvalue_p.h
patch
|
blob
|
history
src/xmlpatterns/api/qresourcedelegator.cpp
patch
|
blob
|
history
src/xmlpatterns/api/qresourcedelegator_p.h
patch
|
blob
|
history
src/xmlpatterns/api/qsimplexmlnodemodel.cpp
patch
|
blob
|
history
src/xmlpatterns/api/qsimplexmlnodemodel.h
patch
|
blob
|
history
src/xmlpatterns/api/qsourcelocation.cpp
patch
|
blob
|
history
src/xmlpatterns/api/qsourcelocation.h
patch
|
blob
|
history
src/xmlpatterns/api/qtxmlpatternsglobal.h
patch
|
blob
|
history
src/xmlpatterns/api/quriloader.cpp
patch
|
blob
|
history
src/xmlpatterns/api/quriloader_p.h
patch
|
blob
|
history
src/xmlpatterns/api/qvariableloader.cpp
patch
|
blob
|
history
src/xmlpatterns/api/qvariableloader_p.h
patch
|
blob
|
history
src/xmlpatterns/api/qxmlformatter.cpp
patch
|
blob
|
history
src/xmlpatterns/api/qxmlformatter.h
patch
|
blob
|
history
src/xmlpatterns/api/qxmlname.cpp
patch
|
blob
|
history
src/xmlpatterns/api/qxmlname.h
patch
|
blob
|
history
src/xmlpatterns/api/qxmlnamepool.cpp
patch
|
blob
|
history
src/xmlpatterns/api/qxmlnamepool.h
patch
|
blob
|
history
src/xmlpatterns/api/qxmlpatternistcli_p.h
patch
|
blob
|
history
src/xmlpatterns/api/qxmlquery.cpp
patch
|
blob
|
history
src/xmlpatterns/api/qxmlquery.h
patch
|
blob
|
history
src/xmlpatterns/api/qxmlquery_p.h
patch
|
blob
|
history
src/xmlpatterns/api/qxmlresultitems.cpp
patch
|
blob
|
history
src/xmlpatterns/api/qxmlresultitems.h
patch
|
blob
|
history
src/xmlpatterns/api/qxmlresultitems_p.h
patch
|
blob
|
history
src/xmlpatterns/api/qxmlschema.cpp
patch
|
blob
|
history
src/xmlpatterns/api/qxmlschema.h
patch
|
blob
|
history
src/xmlpatterns/api/qxmlschema_p.cpp
patch
|
blob
|
history
src/xmlpatterns/api/qxmlschema_p.h
patch
|
blob
|
history
src/xmlpatterns/api/qxmlschemavalidator.cpp
patch
|
blob
|
history
src/xmlpatterns/api/qxmlschemavalidator.h
patch
|
blob
|
history
src/xmlpatterns/api/qxmlschemavalidator_p.h
patch
|
blob
|
history
src/xmlpatterns/api/qxmlserializer.cpp
patch
|
blob
|
history
src/xmlpatterns/api/qxmlserializer.h
patch
|
blob
|
history
src/xmlpatterns/api/qxmlserializer_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qabstractdatetime.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qabstractdatetime_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qabstractduration.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qabstractduration_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qabstractfloat_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qabstractfloat_tpl_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qabstractfloatcasters_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qabstractfloatcasters_tpl_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qabstractfloatmathematician_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qabstractfloatmathematician_tpl_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qanyuri.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qanyuri_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qatomiccaster.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qatomiccaster_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qatomiccasters.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qatomiccasters_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qatomiccomparator.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qatomiccomparator_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qatomiccomparators.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qatomiccomparators_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qatomicmathematician.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qatomicmathematician_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qatomicmathematicians.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qatomicmathematicians_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qatomicstring.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qatomicstring_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qatomicvalue.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qbase64binary.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qbase64binary_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qboolean.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qboolean_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qcommonvalues.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qcommonvalues_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qcomparisonfactory.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qcomparisonfactory_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qdate.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qdate_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qdaytimeduration.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qdaytimeduration_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qdecimal.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qdecimal_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qderivedinteger_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qderivedstring_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qduration.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qduration_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qgday.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qgday_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qgmonth.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qgmonth_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qgmonthday.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qgmonthday_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qgyear.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qgyear_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qgyearmonth.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qgyearmonth_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qhexbinary.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qhexbinary_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qinteger.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qinteger_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qitem.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qitem_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qnodebuilder.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qnodebuilder_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qnodemodel.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qqnamevalue.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qqnamevalue_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qresourceloader.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qresourceloader_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qschemadatetime.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qschemadatetime_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qschemanumeric.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qschemanumeric_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qschematime.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qschematime_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qsequencereceiver.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qsequencereceiver_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qsorttuple.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qsorttuple_p.h
patch
|
blob
|
history
src/xmlpatterns/data/quntypedatomic.cpp
patch
|
blob
|
history
src/xmlpatterns/data/quntypedatomic_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qvalidationerror.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qvalidationerror_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qvaluefactory.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qvaluefactory_p.h
patch
|
blob
|
history
src/xmlpatterns/data/qyearmonthduration.cpp
patch
|
blob
|
history
src/xmlpatterns/data/qyearmonthduration_p.h
patch
|
blob
|
history
src/xmlpatterns/documentationGroups.dox
patch
|
blob
|
history
src/xmlpatterns/environment/createReportContext.sh
patch
|
blob
|
history
src/xmlpatterns/environment/createReportContext.xsl
patch
|
blob
|
history
src/xmlpatterns/environment/qcurrentitemcontext.cpp
patch
|
blob
|
history
src/xmlpatterns/environment/qcurrentitemcontext_p.h
patch
|
blob
|
history
src/xmlpatterns/environment/qdelegatingdynamiccontext.cpp
patch
|
blob
|
history
src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h
patch
|
blob
|
history
src/xmlpatterns/environment/qdelegatingstaticcontext.cpp
patch
|
blob
|
history
src/xmlpatterns/environment/qdelegatingstaticcontext_p.h
patch
|
blob
|
history
src/xmlpatterns/environment/qdynamiccontext.cpp
patch
|
blob
|
history
src/xmlpatterns/environment/qdynamiccontext_p.h
patch
|
blob
|
history
src/xmlpatterns/environment/qfocus.cpp
patch
|
blob
|
history
src/xmlpatterns/environment/qfocus_p.h
patch
|
blob
|
history
src/xmlpatterns/environment/qgenericdynamiccontext.cpp
patch
|
blob
|
history
src/xmlpatterns/environment/qgenericdynamiccontext_p.h
patch
|
blob
|
history
src/xmlpatterns/environment/qgenericstaticcontext.cpp
patch
|
blob
|
history
src/xmlpatterns/environment/qgenericstaticcontext_p.h
patch
|
blob
|
history
src/xmlpatterns/environment/qreceiverdynamiccontext.cpp
patch
|
blob
|
history
src/xmlpatterns/environment/qreceiverdynamiccontext_p.h
patch
|
blob
|
history
src/xmlpatterns/environment/qreportcontext.cpp
patch
|
blob
|
history
src/xmlpatterns/environment/qreportcontext_p.h
patch
|
blob
|
history
src/xmlpatterns/environment/qstackcontextbase_p.h
patch
|
blob
|
history
src/xmlpatterns/environment/qstackcontextbase_tpl_p.h
patch
|
blob
|
history
src/xmlpatterns/environment/qstaticbaseuricontext.cpp
patch
|
blob
|
history
src/xmlpatterns/environment/qstaticbaseuricontext_p.h
patch
|
blob
|
history
src/xmlpatterns/environment/qstaticcompatibilitycontext.cpp
patch
|
blob
|
history
src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h
patch
|
blob
|
history
src/xmlpatterns/environment/qstaticcontext.cpp
patch
|
blob
|
history
src/xmlpatterns/environment/qstaticcontext_p.h
patch
|
blob
|
history
src/xmlpatterns/environment/qstaticcurrentcontext.cpp
patch
|
blob
|
history
src/xmlpatterns/environment/qstaticcurrentcontext_p.h
patch
|
blob
|
history
src/xmlpatterns/environment/qstaticfocuscontext.cpp
patch
|
blob
|
history
src/xmlpatterns/environment/qstaticfocuscontext_p.h
patch
|
blob
|
history
src/xmlpatterns/environment/qstaticnamespacecontext.cpp
patch
|
blob
|
history
src/xmlpatterns/environment/qstaticnamespacecontext_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qandexpression.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qandexpression_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qapplytemplate.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qapplytemplate_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qargumentreference.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qargumentreference_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qarithmeticexpression.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qarithmeticexpression_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qattributeconstructor.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qattributeconstructor_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qattributenamevalidator.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qattributenamevalidator_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qaxisstep.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qaxisstep_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qcachecells_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qcallsite.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qcallsite_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qcalltargetdescription.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qcalltargetdescription_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qcalltemplate.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qcalltemplate_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qcastableas.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qcastableas_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qcastas.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qcastas_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qcastingplatform_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qcastingplatform_tpl_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qcollationchecker.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qcollationchecker_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qcombinenodes.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qcombinenodes_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qcommentconstructor.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qcommentconstructor_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qcomparisonplatform_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qcomparisonplatform_tpl_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qcomputednamespaceconstructor.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qcontextitem.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qcontextitem_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qcopyof.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qcopyof_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qcurrentitemstore.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qcurrentitemstore_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qdocumentconstructor.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qdocumentconstructor_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qdocumentcontentvalidator.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qdocumentcontentvalidator_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qdynamiccontextstore.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qdynamiccontextstore_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qelementconstructor.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qelementconstructor_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qemptycontainer.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qemptycontainer_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qemptysequence.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qemptysequence_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qevaluationcache_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qevaluationcache_tpl_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qexpression.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qexpression_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qexpressiondispatch_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qexpressionfactory.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qexpressionfactory_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qexpressionsequence.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qexpressionsequence_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qexpressionvariablereference.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qexpressionvariablereference_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qexternalvariableloader.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qexternalvariableloader_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qexternalvariablereference.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qexternalvariablereference_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qfirstitempredicate.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qfirstitempredicate_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qforclause.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qforclause_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qgeneralcomparison.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qgeneralcomparison_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qgenericpredicate.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qgenericpredicate_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qifthenclause.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qifthenclause_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qinstanceof.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qinstanceof_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qletclause.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qletclause_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qliteral.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qliteral_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qliteralsequence.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qliteralsequence_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qnamespaceconstructor.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qnamespaceconstructor_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qncnameconstructor.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qncnameconstructor_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qnodecomparison.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qnodecomparison_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qnodesort.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qnodesort_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qoperandsiterator_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qoptimizationpasses.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qoptimizationpasses_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qoptimizerblocks.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qoptimizerblocks_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qoptimizerframework.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qoptimizerframework_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qorderby.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qorderby_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qorexpression.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qorexpression_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qpaircontainer.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qpaircontainer_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qparentnodeaxis.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qparentnodeaxis_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qpath.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qpath_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qpositionalvariablereference.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qpositionalvariablereference_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qprocessinginstructionconstructor.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qqnameconstructor.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qqnameconstructor_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qquantifiedexpression.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qquantifiedexpression_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qrangeexpression.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qrangeexpression_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qrangevariablereference.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qrangevariablereference_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qreturnorderby.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qreturnorderby_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qsimplecontentconstructor.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qsimplecontentconstructor_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qsinglecontainer.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qsinglecontainer_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qsourcelocationreflection.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qsourcelocationreflection_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qstaticbaseuristore.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qstaticbaseuristore_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qstaticcompatibilitystore.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qstaticcompatibilitystore_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qtemplate.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qtemplate_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qtemplateinvoker.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qtemplateinvoker_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qtemplatemode.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qtemplatemode_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qtemplateparameterreference.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qtemplateparameterreference_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qtemplatepattern_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qtextnodeconstructor.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qtextnodeconstructor_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qtreatas.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qtreatas_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qtriplecontainer.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qtriplecontainer_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qtruthpredicate.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qtruthpredicate_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qunaryexpression.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qunaryexpression_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qunlimitedcontainer.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qunlimitedcontainer_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qunresolvedvariablereference.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qunresolvedvariablereference_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/quserfunction.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/quserfunction_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/quserfunctioncallsite.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/quserfunctioncallsite_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qvalidate.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qvalidate_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qvaluecomparison.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qvaluecomparison_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qvariabledeclaration.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qvariabledeclaration_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qvariablereference.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qvariablereference_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qwithparam_p.h
patch
|
blob
|
history
src/xmlpatterns/expr/qxsltsimplecontentconstructor.cpp
patch
|
blob
|
history
src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qabstractfunctionfactory.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qabstractfunctionfactory_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qaccessorfns.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qaccessorfns_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qaggregatefns.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qaggregatefns_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qaggregator.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qaggregator_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qassemblestringfns.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qassemblestringfns_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qbooleanfns.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qbooleanfns_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qcomparescaseaware.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qcomparescaseaware_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qcomparestringfns.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qcomparestringfns_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qcomparingaggregator_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qcomparingaggregator_tpl_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qconstructorfunctionsfactory.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qcontextfns.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qcontextfns_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qcontextnodechecker.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qcontextnodechecker_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qcurrentfn.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qcurrentfn_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qdatetimefn.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qdatetimefn_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qdatetimefns_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qdatetimefns_tpl_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qdeepequalfn.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qdeepequalfn_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qdocumentfn.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qdocumentfn_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qelementavailablefn.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qelementavailablefn_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qerrorfn.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qerrorfn_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qfunctionargument.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qfunctionargument_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qfunctionavailablefn.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qfunctionavailablefn_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qfunctioncall.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qfunctioncall_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qfunctionfactory.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qfunctionfactory_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qfunctionfactorycollection.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qfunctionfactorycollection_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qfunctionsignature.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qfunctionsignature_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qgenerateidfn.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qgenerateidfn_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qnodefns.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qnodefns_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qnumericfns.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qnumericfns_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qpatternmatchingfns.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qpatternmatchingfns_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qpatternplatform.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qpatternplatform_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qqnamefns.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qqnamefns_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qresolveurifn.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qresolveurifn_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qsequencefns.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qsequencefns_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qsequencegeneratingfns.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qsequencegeneratingfns_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qstaticbaseuricontainer_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qstaticnamespacescontainer.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qstaticnamespacescontainer_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qstringvaluefns.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qstringvaluefns_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qsubstringfns.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qsubstringfns_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qsystempropertyfn.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qsystempropertyfn_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qtimezonefns.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qtimezonefns_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qtracefn.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qtracefn_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qtypeavailablefn.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qtypeavailablefn_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qunparsedentitypublicidfn.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qunparsedentityurifn.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qunparsedentityurifn_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qunparsedtextavailablefn.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qunparsedtextavailablefn_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qunparsedtextfn.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qunparsedtextfn_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qxpath10corefunctions.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qxpath10corefunctions_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qxpath20corefunctions.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qxpath20corefunctions_p.h
patch
|
blob
|
history
src/xmlpatterns/functions/qxslt20corefunctions.cpp
patch
|
blob
|
history
src/xmlpatterns/functions/qxslt20corefunctions_p.h
patch
|
blob
|
history
src/xmlpatterns/iterators/qcachingiterator.cpp
patch
|
blob
|
history
src/xmlpatterns/iterators/qcachingiterator_p.h
patch
|
blob
|
history
src/xmlpatterns/iterators/qdeduplicateiterator.cpp
patch
|
blob
|
history
src/xmlpatterns/iterators/qdeduplicateiterator_p.h
patch
|
blob
|
history
src/xmlpatterns/iterators/qdistinctiterator.cpp
patch
|
blob
|
history
src/xmlpatterns/iterators/qdistinctiterator_p.h
patch
|
blob
|
history
src/xmlpatterns/iterators/qemptyiterator_p.h
patch
|
blob
|
history
src/xmlpatterns/iterators/qexceptiterator.cpp
patch
|
blob
|
history
src/xmlpatterns/iterators/qexceptiterator_p.h
patch
|
blob
|
history
src/xmlpatterns/iterators/qindexofiterator.cpp
patch
|
blob
|
history
src/xmlpatterns/iterators/qindexofiterator_p.h
patch
|
blob
|
history
src/xmlpatterns/iterators/qinsertioniterator.cpp
patch
|
blob
|
history
src/xmlpatterns/iterators/qinsertioniterator_p.h
patch
|
blob
|
history
src/xmlpatterns/iterators/qintersectiterator.cpp
patch
|
blob
|
history
src/xmlpatterns/iterators/qintersectiterator_p.h
patch
|
blob
|
history
src/xmlpatterns/iterators/qitemmappingiterator_p.h
patch
|
blob
|
history
src/xmlpatterns/iterators/qrangeiterator.cpp
patch
|
blob
|
history
src/xmlpatterns/iterators/qrangeiterator_p.h
patch
|
blob
|
history
src/xmlpatterns/iterators/qremovaliterator.cpp
patch
|
blob
|
history
src/xmlpatterns/iterators/qremovaliterator_p.h
patch
|
blob
|
history
src/xmlpatterns/iterators/qsequencemappingiterator_p.h
patch
|
blob
|
history
src/xmlpatterns/iterators/qsingletoniterator_p.h
patch
|
blob
|
history
src/xmlpatterns/iterators/qsubsequenceiterator.cpp
patch
|
blob
|
history
src/xmlpatterns/iterators/qsubsequenceiterator_p.h
patch
|
blob
|
history
src/xmlpatterns/iterators/qtocodepointsiterator.cpp
patch
|
blob
|
history
src/xmlpatterns/iterators/qtocodepointsiterator_p.h
patch
|
blob
|
history
src/xmlpatterns/iterators/qunioniterator.cpp
patch
|
blob
|
history
src/xmlpatterns/iterators/qunioniterator_p.h
patch
|
blob
|
history
src/xmlpatterns/janitors/qargumentconverter.cpp
patch
|
blob
|
history
src/xmlpatterns/janitors/qargumentconverter_p.h
patch
|
blob
|
history
src/xmlpatterns/janitors/qatomizer.cpp
patch
|
blob
|
history
src/xmlpatterns/janitors/qatomizer_p.h
patch
|
blob
|
history
src/xmlpatterns/janitors/qcardinalityverifier.cpp
patch
|
blob
|
history
src/xmlpatterns/janitors/qcardinalityverifier_p.h
patch
|
blob
|
history
src/xmlpatterns/janitors/qebvextractor.cpp
patch
|
blob
|
history
src/xmlpatterns/janitors/qebvextractor_p.h
patch
|
blob
|
history
src/xmlpatterns/janitors/qitemverifier.cpp
patch
|
blob
|
history
src/xmlpatterns/janitors/qitemverifier_p.h
patch
|
blob
|
history
src/xmlpatterns/janitors/quntypedatomicconverter.cpp
patch
|
blob
|
history
src/xmlpatterns/janitors/quntypedatomicconverter_p.h
patch
|
blob
|
history
src/xmlpatterns/parser/TokenLookup.gperf
patch
|
blob
|
history
src/xmlpatterns/parser/createParser.sh
patch
|
blob
|
history
src/xmlpatterns/parser/createTokenLookup.sh
patch
|
blob
|
history
src/xmlpatterns/parser/createXSLTTokenLookup.sh
patch
|
blob
|
history
src/xmlpatterns/parser/qmaintainingreader_p.h
patch
|
blob
|
history
src/xmlpatterns/parser/qmaintainingreader_tpl_p.h
patch
|
blob
|
history
src/xmlpatterns/parser/qparsercontext.cpp
patch
|
blob
|
history
src/xmlpatterns/parser/qparsercontext_p.h
patch
|
blob
|
history
src/xmlpatterns/parser/qquerytransformparser.cpp
patch
|
blob
|
history
src/xmlpatterns/parser/qquerytransformparser_p.h
patch
|
blob
|
history
src/xmlpatterns/parser/qtokenizer_p.h
patch
|
blob
|
history
src/xmlpatterns/parser/qtokenlookup.cpp
patch
|
blob
|
history
src/xmlpatterns/parser/qtokenrevealer.cpp
patch
|
blob
|
history
src/xmlpatterns/parser/qtokenrevealer_p.h
patch
|
blob
|
history
src/xmlpatterns/parser/qtokensource.cpp
patch
|
blob
|
history
src/xmlpatterns/parser/qtokensource_p.h
patch
|
blob
|
history
src/xmlpatterns/parser/querytransformparser.ypp
patch
|
blob
|
history
src/xmlpatterns/parser/qxquerytokenizer.cpp
patch
|
blob
|
history
src/xmlpatterns/parser/qxquerytokenizer_p.h
patch
|
blob
|
history
src/xmlpatterns/parser/qxslttokenizer.cpp
patch
|
blob
|
history
src/xmlpatterns/parser/qxslttokenizer_p.h
patch
|
blob
|
history
src/xmlpatterns/parser/qxslttokenlookup.cpp
patch
|
blob
|
history
src/xmlpatterns/parser/qxslttokenlookup.xml
patch
|
blob
|
history
src/xmlpatterns/parser/qxslttokenlookup_p.h
patch
|
blob
|
history
src/xmlpatterns/parser/trolltechHeader.txt
patch
|
blob
|
history
src/xmlpatterns/projection/qdocumentprojector.cpp
patch
|
blob
|
history
src/xmlpatterns/projection/qdocumentprojector_p.h
patch
|
blob
|
history
src/xmlpatterns/projection/qprojectedexpression_p.h
patch
|
blob
|
history
src/xmlpatterns/qtokenautomaton/exampleFile.xml
patch
|
blob
|
history
src/xmlpatterns/schema/qnamespacesupport.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qnamespacesupport_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdalternative.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdalternative_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdannotated.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdannotated_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdannotation.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdannotation_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdapplicationinformation.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdapplicationinformation_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdassertion.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdassertion_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdattribute.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdattribute_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdattributegroup.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdattributegroup_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdattributereference.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdattributereference_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdattributeterm.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdattributeterm_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdattributeuse.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdattributeuse_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdcomplextype.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdcomplextype_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsddocumentation.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsddocumentation_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdelement.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdelement_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdfacet.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdfacet_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdidcache.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdidcache_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdidchelper.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdidchelper_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdidentityconstraint.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdidentityconstraint_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdinstancereader.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdinstancereader_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdmodelgroup.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdmodelgroup_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdnotation.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdnotation_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdparticle.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdparticle_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdparticlechecker.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdparticlechecker_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdreference.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdreference_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdschema.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdschema_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdschemachecker.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdschemachecker_helper.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdschemachecker_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdschemachecker_setup.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdschemacontext.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdschemacontext_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdschemadebugger.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdschemadebugger_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdschemahelper.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdschemahelper_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdschemamerger.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdschemamerger_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdschemaparser.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdschemaparser_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdschemaparser_setup.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdschemaparsercontext.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdschemaparsercontext_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdschemaresolver.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdschemaresolver_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdschematoken.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdschematoken_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdschematypesfactory.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdschematypesfactory_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdsimpletype.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdsimpletype_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdstatemachine_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdstatemachinebuilder.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdterm.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdterm_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdtypechecker.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdtypechecker_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsduserschematype_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsduserschematype_tpl_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdwildcard.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdwildcard_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdxpathexpression.cpp
patch
|
blob
|
history
src/xmlpatterns/schema/qxsdxpathexpression_p.h
patch
|
blob
|
history
src/xmlpatterns/schema/tokens.xml
patch
|
blob
|
history
src/xmlpatterns/type/qabstractnodetest.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qabstractnodetest_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qanyitemtype.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qanyitemtype_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qanynodetype.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qanynodetype_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qanysimpletype.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qanysimpletype_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qanytype.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qanytype_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qatomiccasterlocator.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qatomiccasterlocator_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qatomiccasterlocators.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qatomiccasterlocators_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qatomiccomparatorlocator.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qatomiccomparatorlocator_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qatomiccomparatorlocators.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qatomiccomparatorlocators_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qatomicmathematicianlocator.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qatomicmathematicianlocator_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qatomicmathematicianlocators.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qatomicmathematicianlocators_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qatomictype.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qatomictype_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qatomictypedispatch_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qbasictypesfactory.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qbasictypesfactory_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qbuiltinatomictype.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qbuiltinatomictype_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qbuiltinatomictypes.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qbuiltinatomictypes_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qbuiltinnodetype_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qbuiltinnodetype_tpl_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qbuiltintypes.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qbuiltintypes_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qcardinality.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qcardinality_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qcommonsequencetypes.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qcommonsequencetypes_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qebvtype.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qebvtype_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qemptysequencetype.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qemptysequencetype_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qgenericsequencetype.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qgenericsequencetype_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qitemtype.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qitemtype_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qlocalnametest.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qlocalnametest_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qmultiitemtype.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qmultiitemtype_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qnamedschemacomponent.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qnamedschemacomponent_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qnamespacenametest.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qnamespacenametest_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qnonetype.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qnonetype_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qnumerictype.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qnumerictype_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qprimitives_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qqnametest.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qqnametest_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qschemacomponent.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qschemacomponent_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qschematype.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qschematype_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qschematypefactory.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qschematypefactory_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qsequencetype.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qsequencetype_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qtypechecker.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qtypechecker_p.h
patch
|
blob
|
history
src/xmlpatterns/type/quntyped.cpp
patch
|
blob
|
history
src/xmlpatterns/type/quntyped_p.h
patch
|
blob
|
history
src/xmlpatterns/type/qxsltnodetest.cpp
patch
|
blob
|
history
src/xmlpatterns/type/qxsltnodetest_p.h
patch
|
blob
|
history
src/xmlpatterns/utils/qautoptr.cpp
patch
|
blob
|
history
src/xmlpatterns/utils/qautoptr_p.h
patch
|
blob
|
history
src/xmlpatterns/utils/qcommonnamespaces_p.h
patch
|
blob
|
history
src/xmlpatterns/utils/qcppcastinghelper_p.h
patch
|
blob
|
history
src/xmlpatterns/utils/qdebug_p.h
patch
|
blob
|
history
src/xmlpatterns/utils/qdelegatingnamespaceresolver.cpp
patch
|
blob
|
history
src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h
patch
|
blob
|
history
src/xmlpatterns/utils/qgenericnamespaceresolver.cpp
patch
|
blob
|
history
src/xmlpatterns/utils/qgenericnamespaceresolver_p.h
patch
|
blob
|
history
src/xmlpatterns/utils/qnamepool.cpp
patch
|
blob
|
history
src/xmlpatterns/utils/qnamepool_p.h
patch
|
blob
|
history
src/xmlpatterns/utils/qnamespacebinding_p.h
patch
|
blob
|
history
src/xmlpatterns/utils/qnamespaceresolver.cpp
patch
|
blob
|
history
src/xmlpatterns/utils/qnamespaceresolver_p.h
patch
|
blob
|
history
src/xmlpatterns/utils/qnodenamespaceresolver.cpp
patch
|
blob
|
history
src/xmlpatterns/utils/qnodenamespaceresolver_p.h
patch
|
blob
|
history
src/xmlpatterns/utils/qoutputvalidator.cpp
patch
|
blob
|
history
src/xmlpatterns/utils/qoutputvalidator_p.h
patch
|
blob
|
history
src/xmlpatterns/utils/qpatternistlocale.cpp
patch
|
blob
|
history
src/xmlpatterns/utils/qpatternistlocale_p.h
patch
|
blob
|
history
src/xmlpatterns/utils/qxpathhelper.cpp
patch
|
blob
|
history
src/xmlpatterns/utils/qxpathhelper_p.h
patch
|
blob
|
history
tests/auto/checkxmlfiles/tst_checkxmlfiles.cpp
patch
|
blob
|
history
tests/auto/cmake/test_modules/main.cpp
patch
|
blob
|
history
tests/auto/compilerwarnings/data/test_cpp.txt
patch
|
blob
|
history
tests/auto/headersclean/tst_headersclean.cpp
patch
|
blob
|
history
tests/auto/network-settings.h
patch
|
blob
|
history
tests/auto/patternistexamplefiletree/tst_patternistexamplefiletree.cpp
patch
|
blob
|
history
tests/auto/patternistexamples/tst_patternistexamples.cpp
patch
|
blob
|
history
tests/auto/patternistheaders/tst_patternistheaders.cpp
patch
|
blob
|
history
tests/auto/qabstractmessagehandler/tst_qabstractmessagehandler.cpp
patch
|
blob
|
history
tests/auto/qabstracturiresolver/TestURIResolver.h
patch
|
blob
|
history
tests/auto/qabstracturiresolver/tst_qabstracturiresolver.cpp
patch
|
blob
|
history
tests/auto/qabstractxmlforwarditerator/tst_qabstractxmlforwarditerator.cpp
patch
|
blob
|
history
tests/auto/qabstractxmlnodemodel/LoadingModel.cpp
patch
|
blob
|
history
tests/auto/qabstractxmlnodemodel/LoadingModel.h
patch
|
blob
|
history
tests/auto/qabstractxmlnodemodel/TestNodeModel.h
patch
|
blob
|
history
tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp
patch
|
blob
|
history
tests/auto/qabstractxmlreceiver/TestAbstractXmlReceiver.h
patch
|
blob
|
history
tests/auto/qabstractxmlreceiver/tst_qabstractxmlreceiver.cpp
patch
|
blob
|
history
tests/auto/qapplicationargumentparser/tst_qapplicationargumentparser.cpp
patch
|
blob
|
history
tests/auto/qautoptr/tst_qautoptr.cpp
patch
|
blob
|
history
tests/auto/qsimplexmlnodemodel/TestSimpleNodeModel.h
patch
|
blob
|
history
tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp
patch
|
blob
|
history
tests/auto/qsourcelocation/tst_qsourcelocation.cpp
patch
|
blob
|
history
tests/auto/qxmlformatter/tst_qxmlformatter.cpp
patch
|
blob
|
history
tests/auto/qxmlitem/tst_qxmlitem.cpp
patch
|
blob
|
history
tests/auto/qxmlname/tst_qxmlname.cpp
patch
|
blob
|
history
tests/auto/qxmlnamepool/tst_qxmlnamepool.cpp
patch
|
blob
|
history
tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp
patch
|
blob
|
history
tests/auto/qxmlquery/MessageSilencer.h
patch
|
blob
|
history
tests/auto/qxmlquery/MessageValidator.cpp
patch
|
blob
|
history
tests/auto/qxmlquery/MessageValidator.h
patch
|
blob
|
history
tests/auto/qxmlquery/NetworkOverrider.h
patch
|
blob
|
history
tests/auto/qxmlquery/PushBaseliner.h
patch
|
blob
|
history
tests/auto/qxmlquery/TestFundament.cpp
patch
|
blob
|
history
tests/auto/qxmlquery/TestFundament.h
patch
|
blob
|
history
tests/auto/qxmlquery/tst_qxmlquery.cpp
patch
|
blob
|
history
tests/auto/qxmlresultitems/tst_qxmlresultitems.cpp
patch
|
blob
|
history
tests/auto/qxmlschema/tst_qxmlschema.cpp
patch
|
blob
|
history
tests/auto/qxmlschemavalidator/tst_qxmlschemavalidator.cpp
patch
|
blob
|
history
tests/auto/qxmlserializer/tst_qxmlserializer.cpp
patch
|
blob
|
history
tests/auto/xmlpatterns/tst_xmlpatterns.cpp
patch
|
blob
|
history
tests/auto/xmlpatternsdiagnosticsts/TestSuite/validate.sh
patch
|
blob
|
history
tests/auto/xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp
patch
|
blob
|
history
tests/auto/xmlpatternsschema/tst_xmlpatternsschema.cpp
patch
|
blob
|
history
tests/auto/xmlpatternsschemats/TESTSUITE/updateSuite.sh
patch
|
blob
|
history
tests/auto/xmlpatternsschemats/tst_xmlpatternsschemats.cpp
patch
|
blob
|
history
tests/auto/xmlpatternssdk/ASTItem.cpp
patch
|
blob
|
history
tests/auto/xmlpatternssdk/ASTItem.h
patch
|
blob
|
history
tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp
patch
|
blob
|
history
tests/auto/xmlpatternssdk/DebugExpressionFactory.h
patch
|
blob
|
history
tests/auto/xmlpatternssdk/ErrorHandler.cpp
patch
|
blob
|
history
tests/auto/xmlpatternssdk/ErrorHandler.h
patch
|
blob
|
history
tests/auto/xmlpatternssdk/ErrorItem.cpp
patch
|
blob
|
history
tests/auto/xmlpatternssdk/ErrorItem.h
patch
|
blob
|
history
tests/auto/xmlpatternssdk/ExitCode.h
patch
|
blob
|
history
tests/auto/xmlpatternssdk/ExpressionInfo.cpp
patch
|
blob
|
history
tests/auto/xmlpatternssdk/ExpressionInfo.h
patch
|
blob
|
history
tests/auto/xmlpatternssdk/ExpressionNamer.cpp
patch
|
blob
|
history
tests/auto/xmlpatternssdk/ExpressionNamer.h
patch
|
blob
|
history
tests/auto/xmlpatternssdk/ExternalSourceLoader.cpp
patch
|
blob
|
history
tests/auto/xmlpatternssdk/ExternalSourceLoader.h
patch
|
blob
|
history
tests/auto/xmlpatternssdk/Global.cpp
patch
|
blob
|
history
tests/auto/xmlpatternssdk/Global.h
patch
|
blob
|
history
tests/auto/xmlpatternssdk/ResultThreader.cpp
patch
|
blob
|
history
tests/auto/xmlpatternssdk/ResultThreader.h
patch
|
blob
|
history
tests/auto/xmlpatternssdk/TestBaseLine.cpp
patch
|
blob
|
history
tests/auto/xmlpatternssdk/TestBaseLine.h
patch
|
blob
|
history
tests/auto/xmlpatternssdk/TestCase.cpp
patch
|
blob
|
history
tests/auto/xmlpatternssdk/TestCase.h
patch
|
blob
|
history
tests/auto/xmlpatternssdk/TestContainer.cpp
patch
|
blob
|
history
tests/auto/xmlpatternssdk/TestContainer.h
patch
|
blob
|
history
tests/auto/xmlpatternssdk/TestGroup.cpp
patch
|
blob
|
history
tests/auto/xmlpatternssdk/TestGroup.h
patch
|
blob
|
history
tests/auto/xmlpatternssdk/TestItem.h
patch
|
blob
|
history
tests/auto/xmlpatternssdk/TestResult.cpp
patch
|
blob
|
history
tests/auto/xmlpatternssdk/TestResult.h
patch
|
blob
|
history
tests/auto/xmlpatternssdk/TestResultHandler.cpp
patch
|
blob
|
history
tests/auto/xmlpatternssdk/TestResultHandler.h
patch
|
blob
|
history
tests/auto/xmlpatternssdk/TestSuite.cpp
patch
|
blob
|
history
tests/auto/xmlpatternssdk/TestSuite.h
patch
|
blob
|
history
tests/auto/xmlpatternssdk/TestSuiteHandler.cpp
patch
|
blob
|
history
tests/auto/xmlpatternssdk/TestSuiteHandler.h
patch
|
blob
|
history
tests/auto/xmlpatternssdk/TestSuiteResult.cpp
patch
|
blob
|
history
tests/auto/xmlpatternssdk/TestSuiteResult.h
patch
|
blob
|
history
tests/auto/xmlpatternssdk/TreeItem.cpp
patch
|
blob
|
history
tests/auto/xmlpatternssdk/TreeItem.h
patch
|
blob
|
history
tests/auto/xmlpatternssdk/TreeModel.cpp
patch
|
blob
|
history
tests/auto/xmlpatternssdk/TreeModel.h
patch
|
blob
|
history
tests/auto/xmlpatternssdk/Worker.cpp
patch
|
blob
|
history
tests/auto/xmlpatternssdk/Worker.h
patch
|
blob
|
history
tests/auto/xmlpatternssdk/XMLWriter.cpp
patch
|
blob
|
history
tests/auto/xmlpatternssdk/XMLWriter.h
patch
|
blob
|
history
tests/auto/xmlpatternssdk/XQTSTestCase.cpp
patch
|
blob
|
history
tests/auto/xmlpatternssdk/XQTSTestCase.h
patch
|
blob
|
history
tests/auto/xmlpatternssdk/XSDTSTestCase.cpp
patch
|
blob
|
history
tests/auto/xmlpatternssdk/XSDTSTestCase.h
patch
|
blob
|
history
tests/auto/xmlpatternssdk/XSDTestSuiteHandler.cpp
patch
|
blob
|
history
tests/auto/xmlpatternssdk/XSDTestSuiteHandler.h
patch
|
blob
|
history
tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp
patch
|
blob
|
history
tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.h
patch
|
blob
|
history
tests/auto/xmlpatternssdk/docs/XMLIndenterExample.cpp
patch
|
blob
|
history
tests/auto/xmlpatternssdk/docs/XMLWriterExample.cpp
patch
|
blob
|
history
tests/auto/xmlpatternssdk/tests/XMLWriterTest.cpp
patch
|
blob
|
history
tests/auto/xmlpatternssdk/tests/XMLWriterTest.h
patch
|
blob
|
history
tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp
patch
|
blob
|
history
tests/auto/xmlpatternsview/tst_xmlpatternsview.cpp
patch
|
blob
|
history
tests/auto/xmlpatternsview/view/FunctionSignaturesView.cpp
patch
|
blob
|
history
tests/auto/xmlpatternsview/view/FunctionSignaturesView.h
patch
|
blob
|
history
tests/auto/xmlpatternsview/view/MainWindow.cpp
patch
|
blob
|
history
tests/auto/xmlpatternsview/view/MainWindow.h
patch
|
blob
|
history
tests/auto/xmlpatternsview/view/TestCaseView.cpp
patch
|
blob
|
history
tests/auto/xmlpatternsview/view/TestCaseView.h
patch
|
blob
|
history
tests/auto/xmlpatternsview/view/TestResultView.cpp
patch
|
blob
|
history
tests/auto/xmlpatternsview/view/TestResultView.h
patch
|
blob
|
history
tests/auto/xmlpatternsview/view/TreeSortFilter.cpp
patch
|
blob
|
history
tests/auto/xmlpatternsview/view/TreeSortFilter.h
patch
|
blob
|
history
tests/auto/xmlpatternsview/view/UserTestCase.cpp
patch
|
blob
|
history
tests/auto/xmlpatternsview/view/UserTestCase.h
patch
|
blob
|
history
tests/auto/xmlpatternsview/view/XDTItemItem.cpp
patch
|
blob
|
history
tests/auto/xmlpatternsview/view/XDTItemItem.h
patch
|
blob
|
history
tests/auto/xmlpatternsview/view/main.cpp
patch
|
blob
|
history
tests/auto/xmlpatternsxqts/TESTSUITE/updateSuite.sh
patch
|
blob
|
history
tests/auto/xmlpatternsxqts/summarizeBaseline.sh
patch
|
blob
|
history
tests/auto/xmlpatternsxqts/tst_suitetest.cpp
patch
|
blob
|
history
tests/auto/xmlpatternsxqts/tst_suitetest.h
patch
|
blob
|
history
tests/auto/xmlpatternsxqts/tst_xmlpatternsxqts.cpp
patch
|
blob
|
history
tests/auto/xmlpatternsxslts/XSLTS/updateSuite.sh
patch
|
blob
|
history
tests/auto/xmlpatternsxslts/tst_xmlpatternsxslts.cpp
patch
|
blob
|
history
tools/xmlpatterns/main.cpp
patch
|
blob
|
history
tools/xmlpatterns/main.h
patch
|
blob
|
history
tools/xmlpatterns/qapplicationargument.cpp
patch
|
blob
|
history
tools/xmlpatterns/qapplicationargument_p.h
patch
|
blob
|
history
tools/xmlpatterns/qapplicationargumentparser.cpp
patch
|
blob
|
history
tools/xmlpatterns/qapplicationargumentparser_p.h
patch
|
blob
|
history
tools/xmlpatternsvalidator/main.cpp
patch
|
blob
|
history
tools/xmlpatternsvalidator/main.h
patch
|
blob
|
history
diff --git
a/doc/global/qt-html-templates-offline.qdocconf
b/doc/global/qt-html-templates-offline.qdocconf
index
135d0ab
..
305de14
100644
(file)
--- a/
doc/global/qt-html-templates-offline.qdocconf
+++ b/
doc/global/qt-html-templates-offline.qdocconf
@@
-25,7
+25,7
@@
HTML.endheader = \
HTML.footer = \
"<div class=\"footer\">\n" \
" <p>\n" \
HTML.footer = \
"<div class=\"footer\">\n" \
" <p>\n" \
- " <acronym title=\"Copyright\">©</acronym> 2012
Nokia Corporation
and/or its\n" \
+ " <acronym title=\"Copyright\">©</acronym> 2012
Digia Plc
and/or its\n" \
" subsidiaries. Documentation contributions included herein are the copyrights of\n" \
" their respective owners.</p>\n" \
" <br />\n" \
" subsidiaries. Documentation contributions included herein are the copyrights of\n" \
" their respective owners.</p>\n" \
" <br />\n" \
@@
-38,7
+38,7
@@
HTML.footer = \
" www.qt-project.org</a>.</p>\n" \
" <br />\n" \
" <p>\n" \
" www.qt-project.org</a>.</p>\n" \
" <br />\n" \
" <p>\n" \
- "
Nokia, Qt and their respective logos are trademarks of Nok
ia Corporation \n" \
+ "
Digia, Qt and their respective logos are trademarks of Dig
ia Corporation \n" \
" in Finland and/or other countries worldwide. All other trademarks are property\n" \
" of their respective owners. <a title=\"Privacy Policy\"\n" \
" href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \
" in Finland and/or other countries worldwide. All other trademarks are property\n" \
" of their respective owners. <a title=\"Privacy Policy\"\n" \
" href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \
diff --git
a/doc/qt5.qdocconf
b/doc/qt5.qdocconf
index
e99c7c0
..
de0a7cd
100644
(file)
--- a/
doc/qt5.qdocconf
+++ b/
doc/qt5.qdocconf
@@
-68,4
+68,4
@@
HTML.stylesheets = style/style.css
HTML.headerstyles = " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/style.css\" />\n"
HTML.endheader = "</head>\n<body>\n"
HTML.headerstyles = " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/style.css\" />\n"
HTML.endheader = "</head>\n<body>\n"
-HTML.footer = "<div class=\"footer\">Copyright (c) 2011
Nokia Corporation
and/or its subsidiaries. All rights reserved.</div>\n"
+HTML.footer = "<div class=\"footer\">Copyright (c) 2011
Digia Plc
and/or its subsidiaries. All rights reserved.</div>\n"
diff --git
a/doc/src/examples/filetree.qdoc
b/doc/src/examples/filetree.qdoc
index
6a79e33
..
d9c2aea
100644
(file)
--- a/
doc/src/examples/filetree.qdoc
+++ b/
doc/src/examples/filetree.qdoc
@@
-1,26
+1,26
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:FDL$
**
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:FDL$
-** GNU Free Documentation License
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
** Documentation License version 1.3 as published by the Free Software
** Foundation and appearing in the file included in the packaging of
** Alternatively, this file may be used under the terms of the GNU Free
** Documentation License version 1.3 as published by the Free Software
** Foundation and appearing in the file included in the packaging of
-** this file.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms
-** and conditions contained in a signed written agreement between you
-** and Nokia.
-**
-**
-**
-**
-**
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
** $QT_END_LICENSE$
**
****************************************************************************/
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git
a/doc/src/examples/globalVariables.qdoc
b/doc/src/examples/globalVariables.qdoc
index
b5ec61d
..
08133f6
100644
(file)
--- a/
doc/src/examples/globalVariables.qdoc
+++ b/
doc/src/examples/globalVariables.qdoc
@@
-1,26
+1,26
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:FDL$
**
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:FDL$
-** GNU Free Documentation License
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
** Documentation License version 1.3 as published by the Free Software
** Foundation and appearing in the file included in the packaging of
** Alternatively, this file may be used under the terms of the GNU Free
** Documentation License version 1.3 as published by the Free Software
** Foundation and appearing in the file included in the packaging of
-** this file.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms
-** and conditions contained in a signed written agreement between you
-** and Nokia.
-**
-**
-**
-**
-**
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
** $QT_END_LICENSE$
**
****************************************************************************/
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git
a/doc/src/examples/recipes.qdoc
b/doc/src/examples/recipes.qdoc
index
c9c0e06
..
c42cfb9
100644
(file)
--- a/
doc/src/examples/recipes.qdoc
+++ b/
doc/src/examples/recipes.qdoc
@@
-1,26
+1,26
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:FDL$
**
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:FDL$
-** GNU Free Documentation License
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
** Documentation License version 1.3 as published by the Free Software
** Foundation and appearing in the file included in the packaging of
** Alternatively, this file may be used under the terms of the GNU Free
** Documentation License version 1.3 as published by the Free Software
** Foundation and appearing in the file included in the packaging of
-** this file.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms
-** and conditions contained in a signed written agreement between you
-** and Nokia.
-**
-**
-**
-**
-**
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
** $QT_END_LICENSE$
**
****************************************************************************/
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git
a/doc/src/examples/schema.qdoc
b/doc/src/examples/schema.qdoc
index
4086dd5
..
0dc3a91
100644
(file)
--- a/
doc/src/examples/schema.qdoc
+++ b/
doc/src/examples/schema.qdoc
@@
-1,26
+1,26
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:FDL$
**
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:FDL$
-** GNU Free Documentation License
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
** Documentation License version 1.3 as published by the Free Software
** Foundation and appearing in the file included in the packaging of
** Alternatively, this file may be used under the terms of the GNU Free
** Documentation License version 1.3 as published by the Free Software
** Foundation and appearing in the file included in the packaging of
-** this file.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms
-** and conditions contained in a signed written agreement between you
-** and Nokia.
-**
-**
-**
-**
-**
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
** $QT_END_LICENSE$
**
****************************************************************************/
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git
a/doc/src/examples/trafficinfo.qdoc
b/doc/src/examples/trafficinfo.qdoc
index
59413fc
..
7a8b7e8
100644
(file)
--- a/
doc/src/examples/trafficinfo.qdoc
+++ b/
doc/src/examples/trafficinfo.qdoc
@@
-1,26
+1,26
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:FDL$
**
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:FDL$
-** GNU Free Documentation License
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
** Documentation License version 1.3 as published by the Free Software
** Foundation and appearing in the file included in the packaging of
** Alternatively, this file may be used under the terms of the GNU Free
** Documentation License version 1.3 as published by the Free Software
** Foundation and appearing in the file included in the packaging of
-** this file.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms
-** and conditions contained in a signed written agreement between you
-** and Nokia.
-**
-**
-**
-**
-**
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
** $QT_END_LICENSE$
**
****************************************************************************/
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git
a/doc/src/snippets/code/doc_src_qtxmlpatterns.qdoc
b/doc/src/snippets/code/doc_src_qtxmlpatterns.qdoc
index
5ca93b5
..
ef3702d
100644
(file)
--- a/
doc/src/snippets/code/doc_src_qtxmlpatterns.qdoc
+++ b/
doc/src/snippets/code/doc_src_qtxmlpatterns.qdoc
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the documentation of the Qt Toolkit.
**
**
** This file is part of the documentation of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/doc/src/snippets/code/src_xmlpatterns_api_qabstracturiresolver.cpp
b/doc/src/snippets/code/src_xmlpatterns_api_qabstracturiresolver.cpp
index
d0b5427
..
8d62064
100644
(file)
--- a/
doc/src/snippets/code/src_xmlpatterns_api_qabstracturiresolver.cpp
+++ b/
doc/src/snippets/code/src_xmlpatterns_api_qabstracturiresolver.cpp
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the documentation of the Qt Toolkit.
**
**
** This file is part of the documentation of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlforwarditerator.cpp
b/doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlforwarditerator.cpp
index
226b49e
..
554ca42
100644
(file)
--- a/
doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlforwarditerator.cpp
+++ b/
doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlforwarditerator.cpp
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the documentation of the Qt Toolkit.
**
**
** This file is part of the documentation of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlnodemodel.cpp
b/doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlnodemodel.cpp
index
adce05e
..
f7b5680
100644
(file)
--- a/
doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlnodemodel.cpp
+++ b/
doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlnodemodel.cpp
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the documentation of the Qt Toolkit.
**
**
** This file is part of the documentation of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlreceiver.cpp
b/doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlreceiver.cpp
index
3ead155
..
906b047
100644
(file)
--- a/
doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlreceiver.cpp
+++ b/
doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlreceiver.cpp
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the documentation of the Qt Toolkit.
**
**
** This file is part of the documentation of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/doc/src/snippets/code/src_xmlpatterns_api_qsimplexmlnodemodel.cpp
b/doc/src/snippets/code/src_xmlpatterns_api_qsimplexmlnodemodel.cpp
index
525393c
..
2b7d470
100644
(file)
--- a/
doc/src/snippets/code/src_xmlpatterns_api_qsimplexmlnodemodel.cpp
+++ b/
doc/src/snippets/code/src_xmlpatterns_api_qsimplexmlnodemodel.cpp
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the documentation of the Qt Toolkit.
**
**
** This file is part of the documentation of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/doc/src/snippets/code/src_xmlpatterns_api_qxmlformatter.cpp
b/doc/src/snippets/code/src_xmlpatterns_api_qxmlformatter.cpp
index
2e30e26
..
ba801ba
100644
(file)
--- a/
doc/src/snippets/code/src_xmlpatterns_api_qxmlformatter.cpp
+++ b/
doc/src/snippets/code/src_xmlpatterns_api_qxmlformatter.cpp
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the documentation of the Qt Toolkit.
**
**
** This file is part of the documentation of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/doc/src/snippets/code/src_xmlpatterns_api_qxmlname.cpp
b/doc/src/snippets/code/src_xmlpatterns_api_qxmlname.cpp
index
2279dcc
..
9102b6b
100644
(file)
--- a/
doc/src/snippets/code/src_xmlpatterns_api_qxmlname.cpp
+++ b/
doc/src/snippets/code/src_xmlpatterns_api_qxmlname.cpp
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the documentation of the Qt Toolkit.
**
**
** This file is part of the documentation of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp
b/doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp
index
fce0e30
..
e51582d
100644
(file)
--- a/
doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp
+++ b/
doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the documentation of the Qt Toolkit.
**
**
** This file is part of the documentation of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/doc/src/snippets/code/src_xmlpatterns_api_qxmlresultitems.cpp
b/doc/src/snippets/code/src_xmlpatterns_api_qxmlresultitems.cpp
index
baca131
..
d17627a
100644
(file)
--- a/
doc/src/snippets/code/src_xmlpatterns_api_qxmlresultitems.cpp
+++ b/
doc/src/snippets/code/src_xmlpatterns_api_qxmlresultitems.cpp
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the documentation of the Qt Toolkit.
**
**
** This file is part of the documentation of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/doc/src/snippets/code/src_xmlpatterns_api_qxmlserializer.cpp
b/doc/src/snippets/code/src_xmlpatterns_api_qxmlserializer.cpp
index
3ead155
..
906b047
100644
(file)
--- a/
doc/src/snippets/code/src_xmlpatterns_api_qxmlserializer.cpp
+++ b/
doc/src/snippets/code/src_xmlpatterns_api_qxmlserializer.cpp
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the documentation of the Qt Toolkit.
**
**
** This file is part of the documentation of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/doc/src/snippets/qxmlquery/bindingExample.cpp
b/doc/src/snippets/qxmlquery/bindingExample.cpp
index
82efa9c
..
353f3a1
100644
(file)
--- a/
doc/src/snippets/qxmlquery/bindingExample.cpp
+++ b/
doc/src/snippets/qxmlquery/bindingExample.cpp
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the config.tests of the Qt Toolkit.
**
**
** This file is part of the config.tests of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/doc/src/snippets/qxmlschema/main.cpp
b/doc/src/snippets/qxmlschema/main.cpp
index
1c40cf4
..
718530e
100644
(file)
--- a/
doc/src/snippets/qxmlschema/main.cpp
+++ b/
doc/src/snippets/qxmlschema/main.cpp
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the documentation of the Qt Toolkit.
**
**
** This file is part of the documentation of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/doc/src/snippets/qxmlschemavalidator/main.cpp
b/doc/src/snippets/qxmlschemavalidator/main.cpp
index
dc60f05
..
1992a52
100644
(file)
--- a/
doc/src/snippets/qxmlschemavalidator/main.cpp
+++ b/
doc/src/snippets/qxmlschemavalidator/main.cpp
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the documentation of the Qt Toolkit.
**
**
** This file is part of the documentation of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/doc/src/xml-processing/xml-patterns.qdoc
b/doc/src/xml-processing/xml-patterns.qdoc
index
b3817d3
..
1aab9b7
100644
(file)
--- a/
doc/src/xml-processing/xml-patterns.qdoc
+++ b/
doc/src/xml-processing/xml-patterns.qdoc
@@
-1,26
+1,26
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:FDL$
**
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:FDL$
-** GNU Free Documentation License
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
** Documentation License version 1.3 as published by the Free Software
** Foundation and appearing in the file included in the packaging of
** Alternatively, this file may be used under the terms of the GNU Free
** Documentation License version 1.3 as published by the Free Software
** Foundation and appearing in the file included in the packaging of
-** this file.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms
-** and conditions contained in a signed written agreement between you
-** and Nokia.
-**
-**
-**
-**
-**
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
** $QT_END_LICENSE$
**
****************************************************************************/
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git
a/doc/src/xml-processing/xquery-introduction.qdoc
b/doc/src/xml-processing/xquery-introduction.qdoc
index
560100e
..
c0787d7
100644
(file)
--- a/
doc/src/xml-processing/xquery-introduction.qdoc
+++ b/
doc/src/xml-processing/xquery-introduction.qdoc
@@
-1,26
+1,26
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:FDL$
**
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:FDL$
-** GNU Free Documentation License
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
** Documentation License version 1.3 as published by the Free Software
** Foundation and appearing in the file included in the packaging of
** Alternatively, this file may be used under the terms of the GNU Free
** Documentation License version 1.3 as published by the Free Software
** Foundation and appearing in the file included in the packaging of
-** this file.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms
-** and conditions contained in a signed written agreement between you
-** and Nokia.
-**
-**
-**
-**
-**
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
** $QT_END_LICENSE$
**
****************************************************************************/
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git
a/examples/xmlpatterns/filetree/filetree.cpp
b/examples/xmlpatterns/filetree/filetree.cpp
index
f6af453
..
e71ff18
100644
(file)
--- a/
examples/xmlpatterns/filetree/filetree.cpp
+++ b/
examples/xmlpatterns/filetree/filetree.cpp
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the examples of the Qt Toolkit.
**
**
** This file is part of the examples of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/examples/xmlpatterns/filetree/filetree.h
b/examples/xmlpatterns/filetree/filetree.h
index
30b4a24
..
159dd35
100644
(file)
--- a/
examples/xmlpatterns/filetree/filetree.h
+++ b/
examples/xmlpatterns/filetree/filetree.h
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the examples of the Qt Toolkit.
**
**
** This file is part of the examples of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/examples/xmlpatterns/filetree/main.cpp
b/examples/xmlpatterns/filetree/main.cpp
index
3ee54b9
..
372d722
100644
(file)
--- a/
examples/xmlpatterns/filetree/main.cpp
+++ b/
examples/xmlpatterns/filetree/main.cpp
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the examples of the Qt Toolkit.
**
**
** This file is part of the examples of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/examples/xmlpatterns/filetree/mainwindow.cpp
b/examples/xmlpatterns/filetree/mainwindow.cpp
index
3116305
..
1354a11
100644
(file)
--- a/
examples/xmlpatterns/filetree/mainwindow.cpp
+++ b/
examples/xmlpatterns/filetree/mainwindow.cpp
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the examples of the Qt Toolkit.
**
**
** This file is part of the examples of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/examples/xmlpatterns/filetree/mainwindow.h
b/examples/xmlpatterns/filetree/mainwindow.h
index
42395ca
..
e9ca308
100644
(file)
--- a/
examples/xmlpatterns/filetree/mainwindow.h
+++ b/
examples/xmlpatterns/filetree/mainwindow.h
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the examples of the Qt Toolkit.
**
**
** This file is part of the examples of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/examples/xmlpatterns/recipes/main.cpp
b/examples/xmlpatterns/recipes/main.cpp
index
81ac5cc
..
bfeaaca
100644
(file)
--- a/
examples/xmlpatterns/recipes/main.cpp
+++ b/
examples/xmlpatterns/recipes/main.cpp
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the examples of the Qt Toolkit.
**
**
** This file is part of the examples of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/examples/xmlpatterns/recipes/querymainwindow.cpp
b/examples/xmlpatterns/recipes/querymainwindow.cpp
index
1bdcd7b
..
95dc3b2
100644
(file)
--- a/
examples/xmlpatterns/recipes/querymainwindow.cpp
+++ b/
examples/xmlpatterns/recipes/querymainwindow.cpp
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the examples of the Qt Toolkit.
**
**
** This file is part of the examples of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/examples/xmlpatterns/recipes/querymainwindow.h
b/examples/xmlpatterns/recipes/querymainwindow.h
index
75d5c27
..
666df09
100644
(file)
--- a/
examples/xmlpatterns/recipes/querymainwindow.h
+++ b/
examples/xmlpatterns/recipes/querymainwindow.h
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the examples of the Qt Toolkit.
**
**
** This file is part of the examples of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/examples/xmlpatterns/schema/main.cpp
b/examples/xmlpatterns/schema/main.cpp
index
99c50d6
..
5c39782
100644
(file)
--- a/
examples/xmlpatterns/schema/main.cpp
+++ b/
examples/xmlpatterns/schema/main.cpp
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the examples of the Qt Toolkit.
**
**
** This file is part of the examples of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/examples/xmlpatterns/schema/mainwindow.cpp
b/examples/xmlpatterns/schema/mainwindow.cpp
index
2f454ce
..
aa2e1b0
100644
(file)
--- a/
examples/xmlpatterns/schema/mainwindow.cpp
+++ b/
examples/xmlpatterns/schema/mainwindow.cpp
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the examples of the Qt Toolkit.
**
**
** This file is part of the examples of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/examples/xmlpatterns/schema/mainwindow.h
b/examples/xmlpatterns/schema/mainwindow.h
index
ff7246a
..
6ac6a59
100644
(file)
--- a/
examples/xmlpatterns/schema/mainwindow.h
+++ b/
examples/xmlpatterns/schema/mainwindow.h
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the examples of the Qt Toolkit.
**
**
** This file is part of the examples of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/examples/xmlpatterns/shared/xmlsyntaxhighlighter.cpp
b/examples/xmlpatterns/shared/xmlsyntaxhighlighter.cpp
index
9262121
..
790a66f
100644
(file)
--- a/
examples/xmlpatterns/shared/xmlsyntaxhighlighter.cpp
+++ b/
examples/xmlpatterns/shared/xmlsyntaxhighlighter.cpp
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the examples of the Qt Toolkit.
**
**
** This file is part of the examples of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/examples/xmlpatterns/shared/xmlsyntaxhighlighter.h
b/examples/xmlpatterns/shared/xmlsyntaxhighlighter.h
index
ffeab40
..
b4fb9dd
100644
(file)
--- a/
examples/xmlpatterns/shared/xmlsyntaxhighlighter.h
+++ b/
examples/xmlpatterns/shared/xmlsyntaxhighlighter.h
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the examples of the Qt Toolkit.
**
**
** This file is part of the examples of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/examples/xmlpatterns/trafficinfo/main.cpp
b/examples/xmlpatterns/trafficinfo/main.cpp
index
cda2b9f
..
f2a20b3
100644
(file)
--- a/
examples/xmlpatterns/trafficinfo/main.cpp
+++ b/
examples/xmlpatterns/trafficinfo/main.cpp
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the examples of the Qt Toolkit.
**
**
** This file is part of the examples of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/examples/xmlpatterns/trafficinfo/mainwindow.cpp
b/examples/xmlpatterns/trafficinfo/mainwindow.cpp
index
32bbbd2
..
3e43925
100644
(file)
--- a/
examples/xmlpatterns/trafficinfo/mainwindow.cpp
+++ b/
examples/xmlpatterns/trafficinfo/mainwindow.cpp
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the examples of the Qt Toolkit.
**
**
** This file is part of the examples of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/examples/xmlpatterns/trafficinfo/mainwindow.h
b/examples/xmlpatterns/trafficinfo/mainwindow.h
index
dbfa0a1
..
4573e5a
100644
(file)
--- a/
examples/xmlpatterns/trafficinfo/mainwindow.h
+++ b/
examples/xmlpatterns/trafficinfo/mainwindow.h
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the examples of the Qt Toolkit.
**
**
** This file is part of the examples of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/examples/xmlpatterns/trafficinfo/stationdialog.cpp
b/examples/xmlpatterns/trafficinfo/stationdialog.cpp
index
63f8267
..
6cd267f
100644
(file)
--- a/
examples/xmlpatterns/trafficinfo/stationdialog.cpp
+++ b/
examples/xmlpatterns/trafficinfo/stationdialog.cpp
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the examples of the Qt Toolkit.
**
**
** This file is part of the examples of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/examples/xmlpatterns/trafficinfo/stationdialog.h
b/examples/xmlpatterns/trafficinfo/stationdialog.h
index
bb8a289
..
c720292
100644
(file)
--- a/
examples/xmlpatterns/trafficinfo/stationdialog.h
+++ b/
examples/xmlpatterns/trafficinfo/stationdialog.h
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the examples of the Qt Toolkit.
**
**
** This file is part of the examples of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/examples/xmlpatterns/trafficinfo/stationquery.cpp
b/examples/xmlpatterns/trafficinfo/stationquery.cpp
index
334ea11
..
e445f15
100644
(file)
--- a/
examples/xmlpatterns/trafficinfo/stationquery.cpp
+++ b/
examples/xmlpatterns/trafficinfo/stationquery.cpp
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the examples of the Qt Toolkit.
**
**
** This file is part of the examples of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/examples/xmlpatterns/trafficinfo/stationquery.h
b/examples/xmlpatterns/trafficinfo/stationquery.h
index
c5237ad
..
bda7f11
100644
(file)
--- a/
examples/xmlpatterns/trafficinfo/stationquery.h
+++ b/
examples/xmlpatterns/trafficinfo/stationquery.h
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the examples of the Qt Toolkit.
**
**
** This file is part of the examples of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/examples/xmlpatterns/trafficinfo/timequery.cpp
b/examples/xmlpatterns/trafficinfo/timequery.cpp
index
fcb2fa9
..
547c3b6
100644
(file)
--- a/
examples/xmlpatterns/trafficinfo/timequery.cpp
+++ b/
examples/xmlpatterns/trafficinfo/timequery.cpp
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the examples of the Qt Toolkit.
**
**
** This file is part of the examples of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/examples/xmlpatterns/trafficinfo/timequery.h
b/examples/xmlpatterns/trafficinfo/timequery.h
index
c1b8a67
..
a792dd8
100644
(file)
--- a/
examples/xmlpatterns/trafficinfo/timequery.h
+++ b/
examples/xmlpatterns/trafficinfo/timequery.h
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the examples of the Qt Toolkit.
**
**
** This file is part of the examples of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/examples/xmlpatterns/xquery/globalVariables/globals.cpp
b/examples/xmlpatterns/xquery/globalVariables/globals.cpp
index
28233de
..
4d81ea8
100644
(file)
--- a/
examples/xmlpatterns/xquery/globalVariables/globals.cpp
+++ b/
examples/xmlpatterns/xquery/globalVariables/globals.cpp
@@
-1,7
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the examples of the Qt Toolkit.
**
**
** This file is part of the examples of the Qt Toolkit.
**
@@
-17,10
+17,10
@@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of
Nokia Corporation and its Subsidiary(-ies) nor
-**
the names of its contributors may be used to endorse or promote
-**
products derived from this software without specific prior written
-**
permission.
+** * Neither the name of
Digia Plc and its Subsidiary(-ies) nor the names
+**
of its contributors may be used to endorse or promote products derived
+**
from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git
a/src/xmlpatterns/Mainpage.dox
b/src/xmlpatterns/Mainpage.dox
index
ebc042d
..
973bc46
100644
(file)
--- a/
src/xmlpatterns/Mainpage.dox
+++ b/
src/xmlpatterns/Mainpage.dox
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/acceltree/qacceliterators.cpp
b/src/xmlpatterns/acceltree/qacceliterators.cpp
index
3e73159
..
cdb98f1
100644
(file)
--- a/
src/xmlpatterns/acceltree/qacceliterators.cpp
+++ b/
src/xmlpatterns/acceltree/qacceliterators.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/acceltree/qacceliterators_p.h
b/src/xmlpatterns/acceltree/qacceliterators_p.h
index
1bb3493
..
45c9c00
100644
(file)
--- a/
src/xmlpatterns/acceltree/qacceliterators_p.h
+++ b/
src/xmlpatterns/acceltree/qacceliterators_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/acceltree/qacceltree.cpp
b/src/xmlpatterns/acceltree/qacceltree.cpp
index
358603d
..
5f145ad
100644
(file)
--- a/
src/xmlpatterns/acceltree/qacceltree.cpp
+++ b/
src/xmlpatterns/acceltree/qacceltree.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/acceltree/qacceltree_p.h
b/src/xmlpatterns/acceltree/qacceltree_p.h
index
bde44ea
..
def20c6
100644
(file)
--- a/
src/xmlpatterns/acceltree/qacceltree_p.h
+++ b/
src/xmlpatterns/acceltree/qacceltree_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/acceltree/qacceltreebuilder_p.h
b/src/xmlpatterns/acceltree/qacceltreebuilder_p.h
index
9e4da59
..
8e7eafa
100644
(file)
--- a/
src/xmlpatterns/acceltree/qacceltreebuilder_p.h
+++ b/
src/xmlpatterns/acceltree/qacceltreebuilder_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/acceltree/qacceltreebuilder_tpl_p.h
b/src/xmlpatterns/acceltree/qacceltreebuilder_tpl_p.h
index
289ab6c
..
52b1176
100644
(file)
--- a/
src/xmlpatterns/acceltree/qacceltreebuilder_tpl_p.h
+++ b/
src/xmlpatterns/acceltree/qacceltreebuilder_tpl_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp
b/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp
index
154d515
..
9bb9618
100644
(file)
--- a/
src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp
+++ b/
src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h
b/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h
index
a3b8e44
..
e0f639c
100644
(file)
--- a/
src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h
+++ b/
src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/acceltree/qcompressedwhitespace.cpp
b/src/xmlpatterns/acceltree/qcompressedwhitespace.cpp
index
3760420
..
d5e9b74
100644
(file)
--- a/
src/xmlpatterns/acceltree/qcompressedwhitespace.cpp
+++ b/
src/xmlpatterns/acceltree/qcompressedwhitespace.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h
b/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h
index
3f90d4b
..
05b8a9e
100644
(file)
--- a/
src/xmlpatterns/acceltree/qcompressedwhitespace_p.h
+++ b/
src/xmlpatterns/acceltree/qcompressedwhitespace_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qabstractmessagehandler.cpp
b/src/xmlpatterns/api/qabstractmessagehandler.cpp
index
3f4464b
..
1103b57
100644
(file)
--- a/
src/xmlpatterns/api/qabstractmessagehandler.cpp
+++ b/
src/xmlpatterns/api/qabstractmessagehandler.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qabstractmessagehandler.h
b/src/xmlpatterns/api/qabstractmessagehandler.h
index
d022fc2
..
8fbd8ae
100644
(file)
--- a/
src/xmlpatterns/api/qabstractmessagehandler.h
+++ b/
src/xmlpatterns/api/qabstractmessagehandler.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qabstracturiresolver.cpp
b/src/xmlpatterns/api/qabstracturiresolver.cpp
index
485ea80
..
44279d3
100644
(file)
--- a/
src/xmlpatterns/api/qabstracturiresolver.cpp
+++ b/
src/xmlpatterns/api/qabstracturiresolver.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qabstracturiresolver.h
b/src/xmlpatterns/api/qabstracturiresolver.h
index
16b7a9e
..
5014ec7
100644
(file)
--- a/
src/xmlpatterns/api/qabstracturiresolver.h
+++ b/
src/xmlpatterns/api/qabstracturiresolver.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qabstractxmlforwarditerator.cpp
b/src/xmlpatterns/api/qabstractxmlforwarditerator.cpp
index
03c0eaf
..
ab1f6fb
100644
(file)
--- a/
src/xmlpatterns/api/qabstractxmlforwarditerator.cpp
+++ b/
src/xmlpatterns/api/qabstractxmlforwarditerator.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h
b/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h
index
63241e6
..
5ab4e7d
100644
(file)
--- a/
src/xmlpatterns/api/qabstractxmlforwarditerator_p.h
+++ b/
src/xmlpatterns/api/qabstractxmlforwarditerator_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qabstractxmlnodemodel.cpp
b/src/xmlpatterns/api/qabstractxmlnodemodel.cpp
index
5ca544c
..
7497e38
100644
(file)
--- a/
src/xmlpatterns/api/qabstractxmlnodemodel.cpp
+++ b/
src/xmlpatterns/api/qabstractxmlnodemodel.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qabstractxmlnodemodel.h
b/src/xmlpatterns/api/qabstractxmlnodemodel.h
index
dcfb388
..
08461d7
100644
(file)
--- a/
src/xmlpatterns/api/qabstractxmlnodemodel.h
+++ b/
src/xmlpatterns/api/qabstractxmlnodemodel.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qabstractxmlnodemodel_p.h
b/src/xmlpatterns/api/qabstractxmlnodemodel_p.h
index
db438ec
..
9a91503
100644
(file)
--- a/
src/xmlpatterns/api/qabstractxmlnodemodel_p.h
+++ b/
src/xmlpatterns/api/qabstractxmlnodemodel_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qabstractxmlpullprovider.cpp
b/src/xmlpatterns/api/qabstractxmlpullprovider.cpp
index
6b2c52d
..
a197bf9
100644
(file)
--- a/
src/xmlpatterns/api/qabstractxmlpullprovider.cpp
+++ b/
src/xmlpatterns/api/qabstractxmlpullprovider.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qabstractxmlpullprovider_p.h
b/src/xmlpatterns/api/qabstractxmlpullprovider_p.h
index
f4603f9
..
b84a4a0
100644
(file)
--- a/
src/xmlpatterns/api/qabstractxmlpullprovider_p.h
+++ b/
src/xmlpatterns/api/qabstractxmlpullprovider_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qabstractxmlreceiver.cpp
b/src/xmlpatterns/api/qabstractxmlreceiver.cpp
index
0e095d4
..
d6c5731
100644
(file)
--- a/
src/xmlpatterns/api/qabstractxmlreceiver.cpp
+++ b/
src/xmlpatterns/api/qabstractxmlreceiver.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qabstractxmlreceiver.h
b/src/xmlpatterns/api/qabstractxmlreceiver.h
index
e985f48
..
a31579c
100644
(file)
--- a/
src/xmlpatterns/api/qabstractxmlreceiver.h
+++ b/
src/xmlpatterns/api/qabstractxmlreceiver.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qabstractxmlreceiver_p.h
b/src/xmlpatterns/api/qabstractxmlreceiver_p.h
index
6c8495e
..
ed91afc
100644
(file)
--- a/
src/xmlpatterns/api/qabstractxmlreceiver_p.h
+++ b/
src/xmlpatterns/api/qabstractxmlreceiver_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qcoloringmessagehandler.cpp
b/src/xmlpatterns/api/qcoloringmessagehandler.cpp
index
b7d0d9f
..
65309d2
100644
(file)
--- a/
src/xmlpatterns/api/qcoloringmessagehandler.cpp
+++ b/
src/xmlpatterns/api/qcoloringmessagehandler.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qcoloringmessagehandler_p.h
b/src/xmlpatterns/api/qcoloringmessagehandler_p.h
index
5bc3804
..
bf59536
100644
(file)
--- a/
src/xmlpatterns/api/qcoloringmessagehandler_p.h
+++ b/
src/xmlpatterns/api/qcoloringmessagehandler_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the XMLPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the XMLPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qcoloroutput.cpp
b/src/xmlpatterns/api/qcoloroutput.cpp
index
e5b2118
..
baf151b
100644
(file)
--- a/
src/xmlpatterns/api/qcoloroutput.cpp
+++ b/
src/xmlpatterns/api/qcoloroutput.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qcoloroutput_p.h
b/src/xmlpatterns/api/qcoloroutput_p.h
index
fb12e64
..
864b90d
100644
(file)
--- a/
src/xmlpatterns/api/qcoloroutput_p.h
+++ b/
src/xmlpatterns/api/qcoloroutput_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the XMLPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the XMLPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qdeviceresourceloader_p.h
b/src/xmlpatterns/api/qdeviceresourceloader_p.h
index
3eae3f4
..
d29f1b4
100644
(file)
--- a/
src/xmlpatterns/api/qdeviceresourceloader_p.h
+++ b/
src/xmlpatterns/api/qdeviceresourceloader_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qiodevicedelegate.cpp
b/src/xmlpatterns/api/qiodevicedelegate.cpp
index
77303f4
..
266246d
100644
(file)
--- a/
src/xmlpatterns/api/qiodevicedelegate.cpp
+++ b/
src/xmlpatterns/api/qiodevicedelegate.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qiodevicedelegate_p.h
b/src/xmlpatterns/api/qiodevicedelegate_p.h
index
12454b2
..
42ecc14
100644
(file)
--- a/
src/xmlpatterns/api/qiodevicedelegate_p.h
+++ b/
src/xmlpatterns/api/qiodevicedelegate_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qnetworkaccessdelegator.cpp
b/src/xmlpatterns/api/qnetworkaccessdelegator.cpp
index
6f28648
..
4299f86
100644
(file)
--- a/
src/xmlpatterns/api/qnetworkaccessdelegator.cpp
+++ b/
src/xmlpatterns/api/qnetworkaccessdelegator.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qnetworkaccessdelegator_p.h
b/src/xmlpatterns/api/qnetworkaccessdelegator_p.h
index
8653cd8
..
c9d4d23
100644
(file)
--- a/
src/xmlpatterns/api/qnetworkaccessdelegator_p.h
+++ b/
src/xmlpatterns/api/qnetworkaccessdelegator_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qpullbridge.cpp
b/src/xmlpatterns/api/qpullbridge.cpp
index
73b777e
..
066046c
100644
(file)
--- a/
src/xmlpatterns/api/qpullbridge.cpp
+++ b/
src/xmlpatterns/api/qpullbridge.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qpullbridge_p.h
b/src/xmlpatterns/api/qpullbridge_p.h
index
6364635
..
3b5e746
100644
(file)
--- a/
src/xmlpatterns/api/qpullbridge_p.h
+++ b/
src/xmlpatterns/api/qpullbridge_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qreferencecountedvalue_p.h
b/src/xmlpatterns/api/qreferencecountedvalue_p.h
index
b420d86
..
1f1a81b
100644
(file)
--- a/
src/xmlpatterns/api/qreferencecountedvalue_p.h
+++ b/
src/xmlpatterns/api/qreferencecountedvalue_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qresourcedelegator.cpp
b/src/xmlpatterns/api/qresourcedelegator.cpp
index
e5175bf
..
64bb8b3
100644
(file)
--- a/
src/xmlpatterns/api/qresourcedelegator.cpp
+++ b/
src/xmlpatterns/api/qresourcedelegator.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qresourcedelegator_p.h
b/src/xmlpatterns/api/qresourcedelegator_p.h
index
c03bb97
..
4ededf8
100644
(file)
--- a/
src/xmlpatterns/api/qresourcedelegator_p.h
+++ b/
src/xmlpatterns/api/qresourcedelegator_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qsimplexmlnodemodel.cpp
b/src/xmlpatterns/api/qsimplexmlnodemodel.cpp
index
5586932
..
dcd23c5
100644
(file)
--- a/
src/xmlpatterns/api/qsimplexmlnodemodel.cpp
+++ b/
src/xmlpatterns/api/qsimplexmlnodemodel.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qsimplexmlnodemodel.h
b/src/xmlpatterns/api/qsimplexmlnodemodel.h
index
eb90b9c
..
8fbeb63
100644
(file)
--- a/
src/xmlpatterns/api/qsimplexmlnodemodel.h
+++ b/
src/xmlpatterns/api/qsimplexmlnodemodel.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qsourcelocation.cpp
b/src/xmlpatterns/api/qsourcelocation.cpp
index
9f130ee
..
eb2e43f
100644
(file)
--- a/
src/xmlpatterns/api/qsourcelocation.cpp
+++ b/
src/xmlpatterns/api/qsourcelocation.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qsourcelocation.h
b/src/xmlpatterns/api/qsourcelocation.h
index
2fc6d81
..
f6ccca3
100644
(file)
--- a/
src/xmlpatterns/api/qsourcelocation.h
+++ b/
src/xmlpatterns/api/qsourcelocation.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qtxmlpatternsglobal.h
b/src/xmlpatterns/api/qtxmlpatternsglobal.h
index
76bbc35
..
0795d0b
100644
(file)
--- a/
src/xmlpatterns/api/qtxmlpatternsglobal.h
+++ b/
src/xmlpatterns/api/qtxmlpatternsglobal.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
** Copyright (C) 2012 Intel Corporation.
/****************************************************************************
**
** Copyright (C) 2012 Intel Corporation.
-** Contact: http://www.qt-project.org/
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/quriloader.cpp
b/src/xmlpatterns/api/quriloader.cpp
index
064a5f0
..
21a5363
100644
(file)
--- a/
src/xmlpatterns/api/quriloader.cpp
+++ b/
src/xmlpatterns/api/quriloader.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/quriloader_p.h
b/src/xmlpatterns/api/quriloader_p.h
index
77efb9e
..
f700caf
100644
(file)
--- a/
src/xmlpatterns/api/quriloader_p.h
+++ b/
src/xmlpatterns/api/quriloader_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qvariableloader.cpp
b/src/xmlpatterns/api/qvariableloader.cpp
index
d974d4a
..
80ed1fe
100644
(file)
--- a/
src/xmlpatterns/api/qvariableloader.cpp
+++ b/
src/xmlpatterns/api/qvariableloader.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qvariableloader_p.h
b/src/xmlpatterns/api/qvariableloader_p.h
index
f89bd19
..
c1d6e71
100644
(file)
--- a/
src/xmlpatterns/api/qvariableloader_p.h
+++ b/
src/xmlpatterns/api/qvariableloader_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qxmlformatter.cpp
b/src/xmlpatterns/api/qxmlformatter.cpp
index
619120f
..
0f4ac2f
100644
(file)
--- a/
src/xmlpatterns/api/qxmlformatter.cpp
+++ b/
src/xmlpatterns/api/qxmlformatter.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qxmlformatter.h
b/src/xmlpatterns/api/qxmlformatter.h
index
43df171
..
164d7a4
100644
(file)
--- a/
src/xmlpatterns/api/qxmlformatter.h
+++ b/
src/xmlpatterns/api/qxmlformatter.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qxmlname.cpp
b/src/xmlpatterns/api/qxmlname.cpp
index
0bee853
..
4352395
100644
(file)
--- a/
src/xmlpatterns/api/qxmlname.cpp
+++ b/
src/xmlpatterns/api/qxmlname.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qxmlname.h
b/src/xmlpatterns/api/qxmlname.h
index
ceb79d1
..
eb1f04c
100644
(file)
--- a/
src/xmlpatterns/api/qxmlname.h
+++ b/
src/xmlpatterns/api/qxmlname.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qxmlnamepool.cpp
b/src/xmlpatterns/api/qxmlnamepool.cpp
index
cef7f7b
..
f85eefc
100644
(file)
--- a/
src/xmlpatterns/api/qxmlnamepool.cpp
+++ b/
src/xmlpatterns/api/qxmlnamepool.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qxmlnamepool.h
b/src/xmlpatterns/api/qxmlnamepool.h
index
dc71c27
..
24e7916
100644
(file)
--- a/
src/xmlpatterns/api/qxmlnamepool.h
+++ b/
src/xmlpatterns/api/qxmlnamepool.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qxmlpatternistcli_p.h
b/src/xmlpatterns/api/qxmlpatternistcli_p.h
index
e8a5a66
..
7569589
100644
(file)
--- a/
src/xmlpatterns/api/qxmlpatternistcli_p.h
+++ b/
src/xmlpatterns/api/qxmlpatternistcli_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the XMLPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the XMLPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qxmlquery.cpp
b/src/xmlpatterns/api/qxmlquery.cpp
index
d4c11a3
..
6642e9b
100644
(file)
--- a/
src/xmlpatterns/api/qxmlquery.cpp
+++ b/
src/xmlpatterns/api/qxmlquery.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qxmlquery.h
b/src/xmlpatterns/api/qxmlquery.h
index
61eea1d
..
f8c904f
100644
(file)
--- a/
src/xmlpatterns/api/qxmlquery.h
+++ b/
src/xmlpatterns/api/qxmlquery.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qxmlquery_p.h
b/src/xmlpatterns/api/qxmlquery_p.h
index
47a0653
..
b91f9e5
100644
(file)
--- a/
src/xmlpatterns/api/qxmlquery_p.h
+++ b/
src/xmlpatterns/api/qxmlquery_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qxmlresultitems.cpp
b/src/xmlpatterns/api/qxmlresultitems.cpp
index
308b162
..
878aaa9
100644
(file)
--- a/
src/xmlpatterns/api/qxmlresultitems.cpp
+++ b/
src/xmlpatterns/api/qxmlresultitems.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qxmlresultitems.h
b/src/xmlpatterns/api/qxmlresultitems.h
index
4b192cd
..
64d5335
100644
(file)
--- a/
src/xmlpatterns/api/qxmlresultitems.h
+++ b/
src/xmlpatterns/api/qxmlresultitems.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qxmlresultitems_p.h
b/src/xmlpatterns/api/qxmlresultitems_p.h
index
e01b584
..
2f86fd7
100644
(file)
--- a/
src/xmlpatterns/api/qxmlresultitems_p.h
+++ b/
src/xmlpatterns/api/qxmlresultitems_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qxmlschema.cpp
b/src/xmlpatterns/api/qxmlschema.cpp
index
3de9735
..
446113b
100644
(file)
--- a/
src/xmlpatterns/api/qxmlschema.cpp
+++ b/
src/xmlpatterns/api/qxmlschema.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qxmlschema.h
b/src/xmlpatterns/api/qxmlschema.h
index
88e9642
..
3f4f28a
100644
(file)
--- a/
src/xmlpatterns/api/qxmlschema.h
+++ b/
src/xmlpatterns/api/qxmlschema.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qxmlschema_p.cpp
b/src/xmlpatterns/api/qxmlschema_p.cpp
index
071dc80
..
ab68143
100644
(file)
--- a/
src/xmlpatterns/api/qxmlschema_p.cpp
+++ b/
src/xmlpatterns/api/qxmlschema_p.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qxmlschema_p.h
b/src/xmlpatterns/api/qxmlschema_p.h
index
55318f6
..
63619f7
100644
(file)
--- a/
src/xmlpatterns/api/qxmlschema_p.h
+++ b/
src/xmlpatterns/api/qxmlschema_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qxmlschemavalidator.cpp
b/src/xmlpatterns/api/qxmlschemavalidator.cpp
index
bbf8d9d
..
ac45421
100644
(file)
--- a/
src/xmlpatterns/api/qxmlschemavalidator.cpp
+++ b/
src/xmlpatterns/api/qxmlschemavalidator.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qxmlschemavalidator.h
b/src/xmlpatterns/api/qxmlschemavalidator.h
index
ef2f679
..
237e14a
100644
(file)
--- a/
src/xmlpatterns/api/qxmlschemavalidator.h
+++ b/
src/xmlpatterns/api/qxmlschemavalidator.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qxmlschemavalidator_p.h
b/src/xmlpatterns/api/qxmlschemavalidator_p.h
index
e798cef
..
2ee4b8c
100644
(file)
--- a/
src/xmlpatterns/api/qxmlschemavalidator_p.h
+++ b/
src/xmlpatterns/api/qxmlschemavalidator_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qxmlserializer.cpp
b/src/xmlpatterns/api/qxmlserializer.cpp
index
51af1fc
..
bb2167b
100644
(file)
--- a/
src/xmlpatterns/api/qxmlserializer.cpp
+++ b/
src/xmlpatterns/api/qxmlserializer.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qxmlserializer.h
b/src/xmlpatterns/api/qxmlserializer.h
index
49fdaee
..
74c4eb8
100644
(file)
--- a/
src/xmlpatterns/api/qxmlserializer.h
+++ b/
src/xmlpatterns/api/qxmlserializer.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/api/qxmlserializer_p.h
b/src/xmlpatterns/api/qxmlserializer_p.h
index
13692ff
..
43580d2
100644
(file)
--- a/
src/xmlpatterns/api/qxmlserializer_p.h
+++ b/
src/xmlpatterns/api/qxmlserializer_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qabstractdatetime.cpp
b/src/xmlpatterns/data/qabstractdatetime.cpp
index
04c3046
..
73f5a5f
100644
(file)
--- a/
src/xmlpatterns/data/qabstractdatetime.cpp
+++ b/
src/xmlpatterns/data/qabstractdatetime.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qabstractdatetime_p.h
b/src/xmlpatterns/data/qabstractdatetime_p.h
index
6fc72c7
..
85696a7
100644
(file)
--- a/
src/xmlpatterns/data/qabstractdatetime_p.h
+++ b/
src/xmlpatterns/data/qabstractdatetime_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qabstractduration.cpp
b/src/xmlpatterns/data/qabstractduration.cpp
index
005c284
..
18dc372
100644
(file)
--- a/
src/xmlpatterns/data/qabstractduration.cpp
+++ b/
src/xmlpatterns/data/qabstractduration.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qabstractduration_p.h
b/src/xmlpatterns/data/qabstractduration_p.h
index
a13d3f7
..
696bb0d
100644
(file)
--- a/
src/xmlpatterns/data/qabstractduration_p.h
+++ b/
src/xmlpatterns/data/qabstractduration_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qabstractfloat_p.h
b/src/xmlpatterns/data/qabstractfloat_p.h
index
2c73251
..
cb2b4ed
100644
(file)
--- a/
src/xmlpatterns/data/qabstractfloat_p.h
+++ b/
src/xmlpatterns/data/qabstractfloat_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qabstractfloat_tpl_p.h
b/src/xmlpatterns/data/qabstractfloat_tpl_p.h
index
47ac717
..
1c22b83
100644
(file)
--- a/
src/xmlpatterns/data/qabstractfloat_tpl_p.h
+++ b/
src/xmlpatterns/data/qabstractfloat_tpl_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qabstractfloatcasters_p.h
b/src/xmlpatterns/data/qabstractfloatcasters_p.h
index
ab61924
..
615defb
100644
(file)
--- a/
src/xmlpatterns/data/qabstractfloatcasters_p.h
+++ b/
src/xmlpatterns/data/qabstractfloatcasters_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qabstractfloatcasters_tpl_p.h
b/src/xmlpatterns/data/qabstractfloatcasters_tpl_p.h
index
f805092
..
31063e4
100644
(file)
--- a/
src/xmlpatterns/data/qabstractfloatcasters_tpl_p.h
+++ b/
src/xmlpatterns/data/qabstractfloatcasters_tpl_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qabstractfloatmathematician_p.h
b/src/xmlpatterns/data/qabstractfloatmathematician_p.h
index
e2308b8
..
4f76ba4
100644
(file)
--- a/
src/xmlpatterns/data/qabstractfloatmathematician_p.h
+++ b/
src/xmlpatterns/data/qabstractfloatmathematician_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qabstractfloatmathematician_tpl_p.h
b/src/xmlpatterns/data/qabstractfloatmathematician_tpl_p.h
index
d2e3b85
..
0d8d7d2
100644
(file)
--- a/
src/xmlpatterns/data/qabstractfloatmathematician_tpl_p.h
+++ b/
src/xmlpatterns/data/qabstractfloatmathematician_tpl_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qanyuri.cpp
b/src/xmlpatterns/data/qanyuri.cpp
index
4a51364
..
1fde8e6
100644
(file)
--- a/
src/xmlpatterns/data/qanyuri.cpp
+++ b/
src/xmlpatterns/data/qanyuri.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qanyuri_p.h
b/src/xmlpatterns/data/qanyuri_p.h
index
f9d7599
..
6961e87
100644
(file)
--- a/
src/xmlpatterns/data/qanyuri_p.h
+++ b/
src/xmlpatterns/data/qanyuri_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qatomiccaster.cpp
b/src/xmlpatterns/data/qatomiccaster.cpp
index
2e21d07
..
67cd86e
100644
(file)
--- a/
src/xmlpatterns/data/qatomiccaster.cpp
+++ b/
src/xmlpatterns/data/qatomiccaster.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qatomiccaster_p.h
b/src/xmlpatterns/data/qatomiccaster_p.h
index
1ddc29c
..
54ff76a
100644
(file)
--- a/
src/xmlpatterns/data/qatomiccaster_p.h
+++ b/
src/xmlpatterns/data/qatomiccaster_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qatomiccasters.cpp
b/src/xmlpatterns/data/qatomiccasters.cpp
index
cb8b9df
..
89f3c1f
100644
(file)
--- a/
src/xmlpatterns/data/qatomiccasters.cpp
+++ b/
src/xmlpatterns/data/qatomiccasters.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qatomiccasters_p.h
b/src/xmlpatterns/data/qatomiccasters_p.h
index
6c556cd
..
91720d7
100644
(file)
--- a/
src/xmlpatterns/data/qatomiccasters_p.h
+++ b/
src/xmlpatterns/data/qatomiccasters_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qatomiccomparator.cpp
b/src/xmlpatterns/data/qatomiccomparator.cpp
index
b165750
..
a684d4d
100644
(file)
--- a/
src/xmlpatterns/data/qatomiccomparator.cpp
+++ b/
src/xmlpatterns/data/qatomiccomparator.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qatomiccomparator_p.h
b/src/xmlpatterns/data/qatomiccomparator_p.h
index
3dd2db3
..
4319862
100644
(file)
--- a/
src/xmlpatterns/data/qatomiccomparator_p.h
+++ b/
src/xmlpatterns/data/qatomiccomparator_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qatomiccomparators.cpp
b/src/xmlpatterns/data/qatomiccomparators.cpp
index
5670ebb
..
42ef1d2
100644
(file)
--- a/
src/xmlpatterns/data/qatomiccomparators.cpp
+++ b/
src/xmlpatterns/data/qatomiccomparators.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qatomiccomparators_p.h
b/src/xmlpatterns/data/qatomiccomparators_p.h
index
bad7bff
..
a7709af
100644
(file)
--- a/
src/xmlpatterns/data/qatomiccomparators_p.h
+++ b/
src/xmlpatterns/data/qatomiccomparators_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qatomicmathematician.cpp
b/src/xmlpatterns/data/qatomicmathematician.cpp
index
e18b7b0
..
8347107
100644
(file)
--- a/
src/xmlpatterns/data/qatomicmathematician.cpp
+++ b/
src/xmlpatterns/data/qatomicmathematician.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qatomicmathematician_p.h
b/src/xmlpatterns/data/qatomicmathematician_p.h
index
d833f1b
..
346f545
100644
(file)
--- a/
src/xmlpatterns/data/qatomicmathematician_p.h
+++ b/
src/xmlpatterns/data/qatomicmathematician_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qatomicmathematicians.cpp
b/src/xmlpatterns/data/qatomicmathematicians.cpp
index
b4a49cc
..
ee5ee58
100644
(file)
--- a/
src/xmlpatterns/data/qatomicmathematicians.cpp
+++ b/
src/xmlpatterns/data/qatomicmathematicians.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qatomicmathematicians_p.h
b/src/xmlpatterns/data/qatomicmathematicians_p.h
index
fab19b3
..
7546014
100644
(file)
--- a/
src/xmlpatterns/data/qatomicmathematicians_p.h
+++ b/
src/xmlpatterns/data/qatomicmathematicians_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qatomicstring.cpp
b/src/xmlpatterns/data/qatomicstring.cpp
index
1c187db
..
b624e6f
100644
(file)
--- a/
src/xmlpatterns/data/qatomicstring.cpp
+++ b/
src/xmlpatterns/data/qatomicstring.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qatomicstring_p.h
b/src/xmlpatterns/data/qatomicstring_p.h
index
104a158
..
e22a4e1
100644
(file)
--- a/
src/xmlpatterns/data/qatomicstring_p.h
+++ b/
src/xmlpatterns/data/qatomicstring_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qatomicvalue.cpp
b/src/xmlpatterns/data/qatomicvalue.cpp
index
cc8f207
..
9a7dcc1
100644
(file)
--- a/
src/xmlpatterns/data/qatomicvalue.cpp
+++ b/
src/xmlpatterns/data/qatomicvalue.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qbase64binary.cpp
b/src/xmlpatterns/data/qbase64binary.cpp
index
4b449e6
..
30e0018
100644
(file)
--- a/
src/xmlpatterns/data/qbase64binary.cpp
+++ b/
src/xmlpatterns/data/qbase64binary.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qbase64binary_p.h
b/src/xmlpatterns/data/qbase64binary_p.h
index
c3d54bd
..
76a981c
100644
(file)
--- a/
src/xmlpatterns/data/qbase64binary_p.h
+++ b/
src/xmlpatterns/data/qbase64binary_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qboolean.cpp
b/src/xmlpatterns/data/qboolean.cpp
index
3b1539a
..
b3cd640
100644
(file)
--- a/
src/xmlpatterns/data/qboolean.cpp
+++ b/
src/xmlpatterns/data/qboolean.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qboolean_p.h
b/src/xmlpatterns/data/qboolean_p.h
index
3b95c58
..
89c1c05
100644
(file)
--- a/
src/xmlpatterns/data/qboolean_p.h
+++ b/
src/xmlpatterns/data/qboolean_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qcommonvalues.cpp
b/src/xmlpatterns/data/qcommonvalues.cpp
index
7e0c519
..
91e6e10
100644
(file)
--- a/
src/xmlpatterns/data/qcommonvalues.cpp
+++ b/
src/xmlpatterns/data/qcommonvalues.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qcommonvalues_p.h
b/src/xmlpatterns/data/qcommonvalues_p.h
index
890a38a
..
c98234c
100644
(file)
--- a/
src/xmlpatterns/data/qcommonvalues_p.h
+++ b/
src/xmlpatterns/data/qcommonvalues_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qcomparisonfactory.cpp
b/src/xmlpatterns/data/qcomparisonfactory.cpp
index
5909ab2
..
11a99c6
100644
(file)
--- a/
src/xmlpatterns/data/qcomparisonfactory.cpp
+++ b/
src/xmlpatterns/data/qcomparisonfactory.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qcomparisonfactory_p.h
b/src/xmlpatterns/data/qcomparisonfactory_p.h
index
81ad237
..
826abce
100644
(file)
--- a/
src/xmlpatterns/data/qcomparisonfactory_p.h
+++ b/
src/xmlpatterns/data/qcomparisonfactory_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qdate.cpp
b/src/xmlpatterns/data/qdate.cpp
index
d1f4932
..
93cf48b
100644
(file)
--- a/
src/xmlpatterns/data/qdate.cpp
+++ b/
src/xmlpatterns/data/qdate.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qdate_p.h
b/src/xmlpatterns/data/qdate_p.h
index
bde07dd
..
6004a8b
100644
(file)
--- a/
src/xmlpatterns/data/qdate_p.h
+++ b/
src/xmlpatterns/data/qdate_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qdaytimeduration.cpp
b/src/xmlpatterns/data/qdaytimeduration.cpp
index
89a9184
..
69cd14a
100644
(file)
--- a/
src/xmlpatterns/data/qdaytimeduration.cpp
+++ b/
src/xmlpatterns/data/qdaytimeduration.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qdaytimeduration_p.h
b/src/xmlpatterns/data/qdaytimeduration_p.h
index
2dda2b3
..
f5839ea
100644
(file)
--- a/
src/xmlpatterns/data/qdaytimeduration_p.h
+++ b/
src/xmlpatterns/data/qdaytimeduration_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qdecimal.cpp
b/src/xmlpatterns/data/qdecimal.cpp
index
635cf8c
..
008cc41
100644
(file)
--- a/
src/xmlpatterns/data/qdecimal.cpp
+++ b/
src/xmlpatterns/data/qdecimal.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qdecimal_p.h
b/src/xmlpatterns/data/qdecimal_p.h
index
efeca8d
..
4bea118
100644
(file)
--- a/
src/xmlpatterns/data/qdecimal_p.h
+++ b/
src/xmlpatterns/data/qdecimal_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qderivedinteger_p.h
b/src/xmlpatterns/data/qderivedinteger_p.h
index
3c2c7a6
..
fc091dc
100644
(file)
--- a/
src/xmlpatterns/data/qderivedinteger_p.h
+++ b/
src/xmlpatterns/data/qderivedinteger_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qderivedstring_p.h
b/src/xmlpatterns/data/qderivedstring_p.h
index
5f54f83
..
68c9e8b
100644
(file)
--- a/
src/xmlpatterns/data/qderivedstring_p.h
+++ b/
src/xmlpatterns/data/qderivedstring_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qduration.cpp
b/src/xmlpatterns/data/qduration.cpp
index
1c6ed4a
..
bb73c4b
100644
(file)
--- a/
src/xmlpatterns/data/qduration.cpp
+++ b/
src/xmlpatterns/data/qduration.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qduration_p.h
b/src/xmlpatterns/data/qduration_p.h
index
1619eb4
..
ba196db
100644
(file)
--- a/
src/xmlpatterns/data/qduration_p.h
+++ b/
src/xmlpatterns/data/qduration_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qgday.cpp
b/src/xmlpatterns/data/qgday.cpp
index
793c69a
..
56735e7
100644
(file)
--- a/
src/xmlpatterns/data/qgday.cpp
+++ b/
src/xmlpatterns/data/qgday.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qgday_p.h
b/src/xmlpatterns/data/qgday_p.h
index
9438758
..
e451da4
100644
(file)
--- a/
src/xmlpatterns/data/qgday_p.h
+++ b/
src/xmlpatterns/data/qgday_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qgmonth.cpp
b/src/xmlpatterns/data/qgmonth.cpp
index
8be81aa
..
65f32b3
100644
(file)
--- a/
src/xmlpatterns/data/qgmonth.cpp
+++ b/
src/xmlpatterns/data/qgmonth.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qgmonth_p.h
b/src/xmlpatterns/data/qgmonth_p.h
index
856cbe2
..
257d696
100644
(file)
--- a/
src/xmlpatterns/data/qgmonth_p.h
+++ b/
src/xmlpatterns/data/qgmonth_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qgmonthday.cpp
b/src/xmlpatterns/data/qgmonthday.cpp
index
a2975b0
..
9e37747
100644
(file)
--- a/
src/xmlpatterns/data/qgmonthday.cpp
+++ b/
src/xmlpatterns/data/qgmonthday.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qgmonthday_p.h
b/src/xmlpatterns/data/qgmonthday_p.h
index
8f00780
..
3503a15
100644
(file)
--- a/
src/xmlpatterns/data/qgmonthday_p.h
+++ b/
src/xmlpatterns/data/qgmonthday_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qgyear.cpp
b/src/xmlpatterns/data/qgyear.cpp
index
ffbcb4a
..
8195394
100644
(file)
--- a/
src/xmlpatterns/data/qgyear.cpp
+++ b/
src/xmlpatterns/data/qgyear.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qgyear_p.h
b/src/xmlpatterns/data/qgyear_p.h
index
ab32534
..
16ac4cc
100644
(file)
--- a/
src/xmlpatterns/data/qgyear_p.h
+++ b/
src/xmlpatterns/data/qgyear_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qgyearmonth.cpp
b/src/xmlpatterns/data/qgyearmonth.cpp
index
f7df481
..
1c3245a
100644
(file)
--- a/
src/xmlpatterns/data/qgyearmonth.cpp
+++ b/
src/xmlpatterns/data/qgyearmonth.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qgyearmonth_p.h
b/src/xmlpatterns/data/qgyearmonth_p.h
index
3375f8d
..
dbc6407
100644
(file)
--- a/
src/xmlpatterns/data/qgyearmonth_p.h
+++ b/
src/xmlpatterns/data/qgyearmonth_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qhexbinary.cpp
b/src/xmlpatterns/data/qhexbinary.cpp
index
0aeb3ed
..
8a54392
100644
(file)
--- a/
src/xmlpatterns/data/qhexbinary.cpp
+++ b/
src/xmlpatterns/data/qhexbinary.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qhexbinary_p.h
b/src/xmlpatterns/data/qhexbinary_p.h
index
aaf215f
..
9b4bb4b
100644
(file)
--- a/
src/xmlpatterns/data/qhexbinary_p.h
+++ b/
src/xmlpatterns/data/qhexbinary_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qinteger.cpp
b/src/xmlpatterns/data/qinteger.cpp
index
915c376
..
82cdbfb
100644
(file)
--- a/
src/xmlpatterns/data/qinteger.cpp
+++ b/
src/xmlpatterns/data/qinteger.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qinteger_p.h
b/src/xmlpatterns/data/qinteger_p.h
index
45c9f9d
..
ec826d4
100644
(file)
--- a/
src/xmlpatterns/data/qinteger_p.h
+++ b/
src/xmlpatterns/data/qinteger_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qitem.cpp
b/src/xmlpatterns/data/qitem.cpp
index
c3ec04d
..
80b2a83
100644
(file)
--- a/
src/xmlpatterns/data/qitem.cpp
+++ b/
src/xmlpatterns/data/qitem.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qitem_p.h
b/src/xmlpatterns/data/qitem_p.h
index
020998c
..
1b917e6
100644
(file)
--- a/
src/xmlpatterns/data/qitem_p.h
+++ b/
src/xmlpatterns/data/qitem_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qnodebuilder.cpp
b/src/xmlpatterns/data/qnodebuilder.cpp
index
a83511a
..
a604721
100644
(file)
--- a/
src/xmlpatterns/data/qnodebuilder.cpp
+++ b/
src/xmlpatterns/data/qnodebuilder.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qnodebuilder_p.h
b/src/xmlpatterns/data/qnodebuilder_p.h
index
205efcf
..
63f670c
100644
(file)
--- a/
src/xmlpatterns/data/qnodebuilder_p.h
+++ b/
src/xmlpatterns/data/qnodebuilder_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qnodemodel.cpp
b/src/xmlpatterns/data/qnodemodel.cpp
index
9c53b72
..
b0f1533
100644
(file)
--- a/
src/xmlpatterns/data/qnodemodel.cpp
+++ b/
src/xmlpatterns/data/qnodemodel.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qqnamevalue.cpp
b/src/xmlpatterns/data/qqnamevalue.cpp
index
c5406ce
..
c21eb57
100644
(file)
--- a/
src/xmlpatterns/data/qqnamevalue.cpp
+++ b/
src/xmlpatterns/data/qqnamevalue.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qqnamevalue_p.h
b/src/xmlpatterns/data/qqnamevalue_p.h
index
07d4d68
..
19e8a11
100644
(file)
--- a/
src/xmlpatterns/data/qqnamevalue_p.h
+++ b/
src/xmlpatterns/data/qqnamevalue_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qresourceloader.cpp
b/src/xmlpatterns/data/qresourceloader.cpp
index
90e65a0
..
24dea06
100644
(file)
--- a/
src/xmlpatterns/data/qresourceloader.cpp
+++ b/
src/xmlpatterns/data/qresourceloader.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qresourceloader_p.h
b/src/xmlpatterns/data/qresourceloader_p.h
index
3a585f7
..
b39a04a
100644
(file)
--- a/
src/xmlpatterns/data/qresourceloader_p.h
+++ b/
src/xmlpatterns/data/qresourceloader_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qschemadatetime.cpp
b/src/xmlpatterns/data/qschemadatetime.cpp
index
9557ff8
..
c44cdc9
100644
(file)
--- a/
src/xmlpatterns/data/qschemadatetime.cpp
+++ b/
src/xmlpatterns/data/qschemadatetime.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qschemadatetime_p.h
b/src/xmlpatterns/data/qschemadatetime_p.h
index
7a2831d
..
435d91b
100644
(file)
--- a/
src/xmlpatterns/data/qschemadatetime_p.h
+++ b/
src/xmlpatterns/data/qschemadatetime_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qschemanumeric.cpp
b/src/xmlpatterns/data/qschemanumeric.cpp
index
c78adee
..
76f3573
100644
(file)
--- a/
src/xmlpatterns/data/qschemanumeric.cpp
+++ b/
src/xmlpatterns/data/qschemanumeric.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qschemanumeric_p.h
b/src/xmlpatterns/data/qschemanumeric_p.h
index
18ef8de
..
8b9533b
100644
(file)
--- a/
src/xmlpatterns/data/qschemanumeric_p.h
+++ b/
src/xmlpatterns/data/qschemanumeric_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qschematime.cpp
b/src/xmlpatterns/data/qschematime.cpp
index
04cd912
..
1dbf672
100644
(file)
--- a/
src/xmlpatterns/data/qschematime.cpp
+++ b/
src/xmlpatterns/data/qschematime.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qschematime_p.h
b/src/xmlpatterns/data/qschematime_p.h
index
12a8b20
..
9630255
100644
(file)
--- a/
src/xmlpatterns/data/qschematime_p.h
+++ b/
src/xmlpatterns/data/qschematime_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qsequencereceiver.cpp
b/src/xmlpatterns/data/qsequencereceiver.cpp
index
7caac9f
..
224a002
100644
(file)
--- a/
src/xmlpatterns/data/qsequencereceiver.cpp
+++ b/
src/xmlpatterns/data/qsequencereceiver.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qsequencereceiver_p.h
b/src/xmlpatterns/data/qsequencereceiver_p.h
index
b9c1295
..
39eb3c8
100644
(file)
--- a/
src/xmlpatterns/data/qsequencereceiver_p.h
+++ b/
src/xmlpatterns/data/qsequencereceiver_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qsorttuple.cpp
b/src/xmlpatterns/data/qsorttuple.cpp
index
5c2a88d
..
b42d9cc
100644
(file)
--- a/
src/xmlpatterns/data/qsorttuple.cpp
+++ b/
src/xmlpatterns/data/qsorttuple.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qsorttuple_p.h
b/src/xmlpatterns/data/qsorttuple_p.h
index
095b051
..
810f10e
100644
(file)
--- a/
src/xmlpatterns/data/qsorttuple_p.h
+++ b/
src/xmlpatterns/data/qsorttuple_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/quntypedatomic.cpp
b/src/xmlpatterns/data/quntypedatomic.cpp
index
9c43fae
..
d3c6c25
100644
(file)
--- a/
src/xmlpatterns/data/quntypedatomic.cpp
+++ b/
src/xmlpatterns/data/quntypedatomic.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/quntypedatomic_p.h
b/src/xmlpatterns/data/quntypedatomic_p.h
index
dda0094
..
4518eaa
100644
(file)
--- a/
src/xmlpatterns/data/quntypedatomic_p.h
+++ b/
src/xmlpatterns/data/quntypedatomic_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qvalidationerror.cpp
b/src/xmlpatterns/data/qvalidationerror.cpp
index
6a922da
..
e19e24b
100644
(file)
--- a/
src/xmlpatterns/data/qvalidationerror.cpp
+++ b/
src/xmlpatterns/data/qvalidationerror.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qvalidationerror_p.h
b/src/xmlpatterns/data/qvalidationerror_p.h
index
9417da3
..
d7a1964
100644
(file)
--- a/
src/xmlpatterns/data/qvalidationerror_p.h
+++ b/
src/xmlpatterns/data/qvalidationerror_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qvaluefactory.cpp
b/src/xmlpatterns/data/qvaluefactory.cpp
index
fdbbbaa
..
46f3c46
100644
(file)
--- a/
src/xmlpatterns/data/qvaluefactory.cpp
+++ b/
src/xmlpatterns/data/qvaluefactory.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qvaluefactory_p.h
b/src/xmlpatterns/data/qvaluefactory_p.h
index
75899f4
..
74f1249
100644
(file)
--- a/
src/xmlpatterns/data/qvaluefactory_p.h
+++ b/
src/xmlpatterns/data/qvaluefactory_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qyearmonthduration.cpp
b/src/xmlpatterns/data/qyearmonthduration.cpp
index
3446916
..
a81f656
100644
(file)
--- a/
src/xmlpatterns/data/qyearmonthduration.cpp
+++ b/
src/xmlpatterns/data/qyearmonthduration.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/data/qyearmonthduration_p.h
b/src/xmlpatterns/data/qyearmonthduration_p.h
index
3a998b4
..
cd51494
100644
(file)
--- a/
src/xmlpatterns/data/qyearmonthduration_p.h
+++ b/
src/xmlpatterns/data/qyearmonthduration_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/documentationGroups.dox
b/src/xmlpatterns/documentationGroups.dox
index
9602a06
..
ed9c3f1
100644
(file)
--- a/
src/xmlpatterns/documentationGroups.dox
+++ b/
src/xmlpatterns/documentationGroups.dox
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/createReportContext.sh
b/src/xmlpatterns/environment/createReportContext.sh
index
40f6416
..
e860c1b
100755
(executable)
--- a/
src/xmlpatterns/environment/createReportContext.sh
+++ b/
src/xmlpatterns/environment/createReportContext.sh
@@
-1,39
+1,39
@@
#!/bin/sh
#############################################################################
##
#!/bin/sh
#############################################################################
##
-## Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-## Contact: http://www.qt-project.org/
+## Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+## Contact: http://www.qt-project.org/
legal
##
## This file is the build configuration utility of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL$
##
## This file is the build configuration utility of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Digia. For licensing terms and
+## conditions see http://qt.digia.com/licensing. For further information
+## use the contact form at http://qt.digia.com/contact-us.
+##
## GNU Lesser General Public License Usage
## GNU Lesser General Public License Usage
-##
This file may be used under the terms of the GNU Lesser General Public
-##
License version 2.1 as published by the Free Software Foundation and
-##
appearing in the file LICENSE.LGPL included in the packaging of this
-##
file. Please review the following information to ensure the GNU Lesser
-##
General Public License version 2.1 requirements will be met:
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## In addition, as a special exception,
Nok
ia gives you certain additional
-## rights.
These rights are described in the Nok
ia Qt LGPL Exception
+##
Alternatively, this file may be used under the terms of the GNU Lesser
+##
General Public License version 2.1 as published by the Free Software
+##
Foundation and appearing in the file LICENSE.LGPL included in the
+##
packaging of this file. Please review the following information to
+##
ensure the GNU Lesser General Public License version 2.1 requirements
+##
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception,
Dig
ia gives you certain additional
+## rights.
These rights are described in the Dig
ia Qt LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## GNU General Public License Usage
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU General
-## Public License version 3.0 as published by the Free Software Foundation
-## and appearing in the file LICENSE.GPL included in the packaging of this
-## file. Please review the following information to ensure the GNU General
-## Public License version 3.0 requirements will be met:
-## http://www.gnu.org/copyleft/gpl.html.
-##
-## Other Usage
-## Alternatively, this file may be used in accordance with the terms and
-## conditions contained in a signed written agreement between you and Nokia.
-##
-##
-##
-##
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3.0 as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU General Public License version 3.0 requirements will be
+## met: http://www.gnu.org/copyleft/gpl.html.
##
##
## $QT_END_LICENSE$
##
##
## $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/createReportContext.xsl
b/src/xmlpatterns/environment/createReportContext.xsl
index
abb310c
..
cb6a26a
100644
(file)
--- a/
src/xmlpatterns/environment/createReportContext.xsl
+++ b/
src/xmlpatterns/environment/createReportContext.xsl
@@
-2,39
+2,39
@@
<!--
/****************************************************************************
**
<!--
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the Patternist project on Qt Labs.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the Patternist project on Qt Labs.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
@@
-91,39
+91,39
@@
NOTE: Be aware of binary compatibility when using this stylesheet.
<xsl:template match="/"><xsl:text disable-output-escaping="yes"
><![CDATA[/****************************************************************************
**
<xsl:template match="/"><xsl:text disable-output-escaping="yes"
><![CDATA[/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qcurrentitemcontext.cpp
b/src/xmlpatterns/environment/qcurrentitemcontext.cpp
index
56c507a
..
127aaa3
100644
(file)
--- a/
src/xmlpatterns/environment/qcurrentitemcontext.cpp
+++ b/
src/xmlpatterns/environment/qcurrentitemcontext.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qcurrentitemcontext_p.h
b/src/xmlpatterns/environment/qcurrentitemcontext_p.h
index
1014976
..
51fcbbb
100644
(file)
--- a/
src/xmlpatterns/environment/qcurrentitemcontext_p.h
+++ b/
src/xmlpatterns/environment/qcurrentitemcontext_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qdelegatingdynamiccontext.cpp
b/src/xmlpatterns/environment/qdelegatingdynamiccontext.cpp
index
6f62065
..
8f4695d
100644
(file)
--- a/
src/xmlpatterns/environment/qdelegatingdynamiccontext.cpp
+++ b/
src/xmlpatterns/environment/qdelegatingdynamiccontext.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h
b/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h
index
3f894b8
..
75fb2d7
100644
(file)
--- a/
src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h
+++ b/
src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qdelegatingstaticcontext.cpp
b/src/xmlpatterns/environment/qdelegatingstaticcontext.cpp
index
1b799ca
..
53b23fc
100644
(file)
--- a/
src/xmlpatterns/environment/qdelegatingstaticcontext.cpp
+++ b/
src/xmlpatterns/environment/qdelegatingstaticcontext.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h
b/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h
index
fd135be
..
a1e7b4e
100644
(file)
--- a/
src/xmlpatterns/environment/qdelegatingstaticcontext_p.h
+++ b/
src/xmlpatterns/environment/qdelegatingstaticcontext_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qdynamiccontext.cpp
b/src/xmlpatterns/environment/qdynamiccontext.cpp
index
36db449
..
b7be961
100644
(file)
--- a/
src/xmlpatterns/environment/qdynamiccontext.cpp
+++ b/
src/xmlpatterns/environment/qdynamiccontext.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qdynamiccontext_p.h
b/src/xmlpatterns/environment/qdynamiccontext_p.h
index
fd48c26
..
51fd63e
100644
(file)
--- a/
src/xmlpatterns/environment/qdynamiccontext_p.h
+++ b/
src/xmlpatterns/environment/qdynamiccontext_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qfocus.cpp
b/src/xmlpatterns/environment/qfocus.cpp
index
02a69d4
..
31e82df
100644
(file)
--- a/
src/xmlpatterns/environment/qfocus.cpp
+++ b/
src/xmlpatterns/environment/qfocus.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qfocus_p.h
b/src/xmlpatterns/environment/qfocus_p.h
index
b10bf70
..
57397c8
100644
(file)
--- a/
src/xmlpatterns/environment/qfocus_p.h
+++ b/
src/xmlpatterns/environment/qfocus_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qgenericdynamiccontext.cpp
b/src/xmlpatterns/environment/qgenericdynamiccontext.cpp
index
bad68f5
..
606363e
100644
(file)
--- a/
src/xmlpatterns/environment/qgenericdynamiccontext.cpp
+++ b/
src/xmlpatterns/environment/qgenericdynamiccontext.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qgenericdynamiccontext_p.h
b/src/xmlpatterns/environment/qgenericdynamiccontext_p.h
index
141a4a6
..
feb4c7a
100644
(file)
--- a/
src/xmlpatterns/environment/qgenericdynamiccontext_p.h
+++ b/
src/xmlpatterns/environment/qgenericdynamiccontext_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qgenericstaticcontext.cpp
b/src/xmlpatterns/environment/qgenericstaticcontext.cpp
index
4430e45
..
1c09b9f
100644
(file)
--- a/
src/xmlpatterns/environment/qgenericstaticcontext.cpp
+++ b/
src/xmlpatterns/environment/qgenericstaticcontext.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qgenericstaticcontext_p.h
b/src/xmlpatterns/environment/qgenericstaticcontext_p.h
index
0a61be2
..
d0d393c
100644
(file)
--- a/
src/xmlpatterns/environment/qgenericstaticcontext_p.h
+++ b/
src/xmlpatterns/environment/qgenericstaticcontext_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qreceiverdynamiccontext.cpp
b/src/xmlpatterns/environment/qreceiverdynamiccontext.cpp
index
73b5e8e
..
b80f56f
100644
(file)
--- a/
src/xmlpatterns/environment/qreceiverdynamiccontext.cpp
+++ b/
src/xmlpatterns/environment/qreceiverdynamiccontext.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h
b/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h
index
c41ff54
..
96e8cbc
100644
(file)
--- a/
src/xmlpatterns/environment/qreceiverdynamiccontext_p.h
+++ b/
src/xmlpatterns/environment/qreceiverdynamiccontext_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qreportcontext.cpp
b/src/xmlpatterns/environment/qreportcontext.cpp
index
c84afb1
..
c49d55a
100644
(file)
--- a/
src/xmlpatterns/environment/qreportcontext.cpp
+++ b/
src/xmlpatterns/environment/qreportcontext.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qreportcontext_p.h
b/src/xmlpatterns/environment/qreportcontext_p.h
index
75fb61b
..
035bea6
100644
(file)
--- a/
src/xmlpatterns/environment/qreportcontext_p.h
+++ b/
src/xmlpatterns/environment/qreportcontext_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qstackcontextbase_p.h
b/src/xmlpatterns/environment/qstackcontextbase_p.h
index
043aaf0
..
1a6184e
100644
(file)
--- a/
src/xmlpatterns/environment/qstackcontextbase_p.h
+++ b/
src/xmlpatterns/environment/qstackcontextbase_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qstackcontextbase_tpl_p.h
b/src/xmlpatterns/environment/qstackcontextbase_tpl_p.h
index
a422182
..
f0d60c3
100644
(file)
--- a/
src/xmlpatterns/environment/qstackcontextbase_tpl_p.h
+++ b/
src/xmlpatterns/environment/qstackcontextbase_tpl_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qstaticbaseuricontext.cpp
b/src/xmlpatterns/environment/qstaticbaseuricontext.cpp
index
f5b75a9
..
fc7083f
100644
(file)
--- a/
src/xmlpatterns/environment/qstaticbaseuricontext.cpp
+++ b/
src/xmlpatterns/environment/qstaticbaseuricontext.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qstaticbaseuricontext_p.h
b/src/xmlpatterns/environment/qstaticbaseuricontext_p.h
index
18da15c
..
bde699e
100644
(file)
--- a/
src/xmlpatterns/environment/qstaticbaseuricontext_p.h
+++ b/
src/xmlpatterns/environment/qstaticbaseuricontext_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qstaticcompatibilitycontext.cpp
b/src/xmlpatterns/environment/qstaticcompatibilitycontext.cpp
index
9c20640
..
5f146dd
100644
(file)
--- a/
src/xmlpatterns/environment/qstaticcompatibilitycontext.cpp
+++ b/
src/xmlpatterns/environment/qstaticcompatibilitycontext.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h
b/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h
index
9932da3
..
f4bbd93
100644
(file)
--- a/
src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h
+++ b/
src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qstaticcontext.cpp
b/src/xmlpatterns/environment/qstaticcontext.cpp
index
37db732
..
d1cd5a9
100644
(file)
--- a/
src/xmlpatterns/environment/qstaticcontext.cpp
+++ b/
src/xmlpatterns/environment/qstaticcontext.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qstaticcontext_p.h
b/src/xmlpatterns/environment/qstaticcontext_p.h
index
26a3b8f
..
89cbc31
100644
(file)
--- a/
src/xmlpatterns/environment/qstaticcontext_p.h
+++ b/
src/xmlpatterns/environment/qstaticcontext_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qstaticcurrentcontext.cpp
b/src/xmlpatterns/environment/qstaticcurrentcontext.cpp
index
2e59385
..
1987b18
100644
(file)
--- a/
src/xmlpatterns/environment/qstaticcurrentcontext.cpp
+++ b/
src/xmlpatterns/environment/qstaticcurrentcontext.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qstaticcurrentcontext_p.h
b/src/xmlpatterns/environment/qstaticcurrentcontext_p.h
index
e9fd83e
..
ba19eb4
100644
(file)
--- a/
src/xmlpatterns/environment/qstaticcurrentcontext_p.h
+++ b/
src/xmlpatterns/environment/qstaticcurrentcontext_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qstaticfocuscontext.cpp
b/src/xmlpatterns/environment/qstaticfocuscontext.cpp
index
b5d772a
..
ea030f6
100644
(file)
--- a/
src/xmlpatterns/environment/qstaticfocuscontext.cpp
+++ b/
src/xmlpatterns/environment/qstaticfocuscontext.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qstaticfocuscontext_p.h
b/src/xmlpatterns/environment/qstaticfocuscontext_p.h
index
9ca8ee6
..
0dc5931
100644
(file)
--- a/
src/xmlpatterns/environment/qstaticfocuscontext_p.h
+++ b/
src/xmlpatterns/environment/qstaticfocuscontext_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qstaticnamespacecontext.cpp
b/src/xmlpatterns/environment/qstaticnamespacecontext.cpp
index
28b5ae5
..
db94139
100644
(file)
--- a/
src/xmlpatterns/environment/qstaticnamespacecontext.cpp
+++ b/
src/xmlpatterns/environment/qstaticnamespacecontext.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/environment/qstaticnamespacecontext_p.h
b/src/xmlpatterns/environment/qstaticnamespacecontext_p.h
index
4bcadcb
..
7dd8392
100644
(file)
--- a/
src/xmlpatterns/environment/qstaticnamespacecontext_p.h
+++ b/
src/xmlpatterns/environment/qstaticnamespacecontext_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qandexpression.cpp
b/src/xmlpatterns/expr/qandexpression.cpp
index
2a7ad23
..
ff935fe
100644
(file)
--- a/
src/xmlpatterns/expr/qandexpression.cpp
+++ b/
src/xmlpatterns/expr/qandexpression.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qandexpression_p.h
b/src/xmlpatterns/expr/qandexpression_p.h
index
0e14302
..
03b1584
100644
(file)
--- a/
src/xmlpatterns/expr/qandexpression_p.h
+++ b/
src/xmlpatterns/expr/qandexpression_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qapplytemplate.cpp
b/src/xmlpatterns/expr/qapplytemplate.cpp
index
fdf966b
..
464ab16
100644
(file)
--- a/
src/xmlpatterns/expr/qapplytemplate.cpp
+++ b/
src/xmlpatterns/expr/qapplytemplate.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qapplytemplate_p.h
b/src/xmlpatterns/expr/qapplytemplate_p.h
index
1b66be0
..
3e42f33
100644
(file)
--- a/
src/xmlpatterns/expr/qapplytemplate_p.h
+++ b/
src/xmlpatterns/expr/qapplytemplate_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qargumentreference.cpp
b/src/xmlpatterns/expr/qargumentreference.cpp
index
f6fa068
..
a1999d9
100644
(file)
--- a/
src/xmlpatterns/expr/qargumentreference.cpp
+++ b/
src/xmlpatterns/expr/qargumentreference.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qargumentreference_p.h
b/src/xmlpatterns/expr/qargumentreference_p.h
index
ef876ea
..
ecdd72a
100644
(file)
--- a/
src/xmlpatterns/expr/qargumentreference_p.h
+++ b/
src/xmlpatterns/expr/qargumentreference_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qarithmeticexpression.cpp
b/src/xmlpatterns/expr/qarithmeticexpression.cpp
index
034ecab
..
c3d200b
100644
(file)
--- a/
src/xmlpatterns/expr/qarithmeticexpression.cpp
+++ b/
src/xmlpatterns/expr/qarithmeticexpression.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qarithmeticexpression_p.h
b/src/xmlpatterns/expr/qarithmeticexpression_p.h
index
a7d737e
..
933df98
100644
(file)
--- a/
src/xmlpatterns/expr/qarithmeticexpression_p.h
+++ b/
src/xmlpatterns/expr/qarithmeticexpression_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qattributeconstructor.cpp
b/src/xmlpatterns/expr/qattributeconstructor.cpp
index
6244bf4
..
a3b8adc
100644
(file)
--- a/
src/xmlpatterns/expr/qattributeconstructor.cpp
+++ b/
src/xmlpatterns/expr/qattributeconstructor.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qattributeconstructor_p.h
b/src/xmlpatterns/expr/qattributeconstructor_p.h
index
887e8f0
..
2a29c0d
100644
(file)
--- a/
src/xmlpatterns/expr/qattributeconstructor_p.h
+++ b/
src/xmlpatterns/expr/qattributeconstructor_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qattributenamevalidator.cpp
b/src/xmlpatterns/expr/qattributenamevalidator.cpp
index
835c60c
..
87f07c8
100644
(file)
--- a/
src/xmlpatterns/expr/qattributenamevalidator.cpp
+++ b/
src/xmlpatterns/expr/qattributenamevalidator.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qattributenamevalidator_p.h
b/src/xmlpatterns/expr/qattributenamevalidator_p.h
index
2dae1e7
..
ea7b832
100644
(file)
--- a/
src/xmlpatterns/expr/qattributenamevalidator_p.h
+++ b/
src/xmlpatterns/expr/qattributenamevalidator_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qaxisstep.cpp
b/src/xmlpatterns/expr/qaxisstep.cpp
index
c001b3f
..
0052bcf
100644
(file)
--- a/
src/xmlpatterns/expr/qaxisstep.cpp
+++ b/
src/xmlpatterns/expr/qaxisstep.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qaxisstep_p.h
b/src/xmlpatterns/expr/qaxisstep_p.h
index
4198de5
..
faf247f
100644
(file)
--- a/
src/xmlpatterns/expr/qaxisstep_p.h
+++ b/
src/xmlpatterns/expr/qaxisstep_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qcachecells_p.h
b/src/xmlpatterns/expr/qcachecells_p.h
index
15e6298
..
69a0045
100644
(file)
--- a/
src/xmlpatterns/expr/qcachecells_p.h
+++ b/
src/xmlpatterns/expr/qcachecells_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qcallsite.cpp
b/src/xmlpatterns/expr/qcallsite.cpp
index
126f192
..
e3bcf89
100644
(file)
--- a/
src/xmlpatterns/expr/qcallsite.cpp
+++ b/
src/xmlpatterns/expr/qcallsite.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qcallsite_p.h
b/src/xmlpatterns/expr/qcallsite_p.h
index
c717197
..
90b13ee
100644
(file)
--- a/
src/xmlpatterns/expr/qcallsite_p.h
+++ b/
src/xmlpatterns/expr/qcallsite_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qcalltargetdescription.cpp
b/src/xmlpatterns/expr/qcalltargetdescription.cpp
index
3f11a5a
..
67e63ed
100644
(file)
--- a/
src/xmlpatterns/expr/qcalltargetdescription.cpp
+++ b/
src/xmlpatterns/expr/qcalltargetdescription.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qcalltargetdescription_p.h
b/src/xmlpatterns/expr/qcalltargetdescription_p.h
index
8cf03b3
..
4489b1b
100644
(file)
--- a/
src/xmlpatterns/expr/qcalltargetdescription_p.h
+++ b/
src/xmlpatterns/expr/qcalltargetdescription_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qcalltemplate.cpp
b/src/xmlpatterns/expr/qcalltemplate.cpp
index
0847db3
..
d3a24c2
100644
(file)
--- a/
src/xmlpatterns/expr/qcalltemplate.cpp
+++ b/
src/xmlpatterns/expr/qcalltemplate.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qcalltemplate_p.h
b/src/xmlpatterns/expr/qcalltemplate_p.h
index
2720e19
..
d3f787d
100644
(file)
--- a/
src/xmlpatterns/expr/qcalltemplate_p.h
+++ b/
src/xmlpatterns/expr/qcalltemplate_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qcastableas.cpp
b/src/xmlpatterns/expr/qcastableas.cpp
index
312b9a5
..
1f4f9b5
100644
(file)
--- a/
src/xmlpatterns/expr/qcastableas.cpp
+++ b/
src/xmlpatterns/expr/qcastableas.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qcastableas_p.h
b/src/xmlpatterns/expr/qcastableas_p.h
index
c6c72e9
..
94be0ef
100644
(file)
--- a/
src/xmlpatterns/expr/qcastableas_p.h
+++ b/
src/xmlpatterns/expr/qcastableas_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qcastas.cpp
b/src/xmlpatterns/expr/qcastas.cpp
index
89d7251
..
a4d733d
100644
(file)
--- a/
src/xmlpatterns/expr/qcastas.cpp
+++ b/
src/xmlpatterns/expr/qcastas.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qcastas_p.h
b/src/xmlpatterns/expr/qcastas_p.h
index
e672d65
..
75723c5
100644
(file)
--- a/
src/xmlpatterns/expr/qcastas_p.h
+++ b/
src/xmlpatterns/expr/qcastas_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qcastingplatform_p.h
b/src/xmlpatterns/expr/qcastingplatform_p.h
index
4836fd7
..
1f6b32d
100644
(file)
--- a/
src/xmlpatterns/expr/qcastingplatform_p.h
+++ b/
src/xmlpatterns/expr/qcastingplatform_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qcastingplatform_tpl_p.h
b/src/xmlpatterns/expr/qcastingplatform_tpl_p.h
index
19f3796
..
c001d4c
100644
(file)
--- a/
src/xmlpatterns/expr/qcastingplatform_tpl_p.h
+++ b/
src/xmlpatterns/expr/qcastingplatform_tpl_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qcollationchecker.cpp
b/src/xmlpatterns/expr/qcollationchecker.cpp
index
7e3fa07
..
4c26e01
100644
(file)
--- a/
src/xmlpatterns/expr/qcollationchecker.cpp
+++ b/
src/xmlpatterns/expr/qcollationchecker.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qcollationchecker_p.h
b/src/xmlpatterns/expr/qcollationchecker_p.h
index
f736894
..
339f68c
100644
(file)
--- a/
src/xmlpatterns/expr/qcollationchecker_p.h
+++ b/
src/xmlpatterns/expr/qcollationchecker_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qcombinenodes.cpp
b/src/xmlpatterns/expr/qcombinenodes.cpp
index
fb45007
..
213502f
100644
(file)
--- a/
src/xmlpatterns/expr/qcombinenodes.cpp
+++ b/
src/xmlpatterns/expr/qcombinenodes.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qcombinenodes_p.h
b/src/xmlpatterns/expr/qcombinenodes_p.h
index
60cb743
..
c94bddf
100644
(file)
--- a/
src/xmlpatterns/expr/qcombinenodes_p.h
+++ b/
src/xmlpatterns/expr/qcombinenodes_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qcommentconstructor.cpp
b/src/xmlpatterns/expr/qcommentconstructor.cpp
index
beee319
..
406e463
100644
(file)
--- a/
src/xmlpatterns/expr/qcommentconstructor.cpp
+++ b/
src/xmlpatterns/expr/qcommentconstructor.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qcommentconstructor_p.h
b/src/xmlpatterns/expr/qcommentconstructor_p.h
index
5ed7a6a
..
6c898c5
100644
(file)
--- a/
src/xmlpatterns/expr/qcommentconstructor_p.h
+++ b/
src/xmlpatterns/expr/qcommentconstructor_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qcomparisonplatform_p.h
b/src/xmlpatterns/expr/qcomparisonplatform_p.h
index
aacf6a2
..
dd98047
100644
(file)
--- a/
src/xmlpatterns/expr/qcomparisonplatform_p.h
+++ b/
src/xmlpatterns/expr/qcomparisonplatform_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qcomparisonplatform_tpl_p.h
b/src/xmlpatterns/expr/qcomparisonplatform_tpl_p.h
index
052a47a
..
55e1230
100644
(file)
--- a/
src/xmlpatterns/expr/qcomparisonplatform_tpl_p.h
+++ b/
src/xmlpatterns/expr/qcomparisonplatform_tpl_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qcomputednamespaceconstructor.cpp
b/src/xmlpatterns/expr/qcomputednamespaceconstructor.cpp
index
b303216
..
a8d4f8a
100644
(file)
--- a/
src/xmlpatterns/expr/qcomputednamespaceconstructor.cpp
+++ b/
src/xmlpatterns/expr/qcomputednamespaceconstructor.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h
b/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h
index
11cd7ef
..
9d542ee
100644
(file)
--- a/
src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h
+++ b/
src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qcontextitem.cpp
b/src/xmlpatterns/expr/qcontextitem.cpp
index
73a19d1
..
012e8a9
100644
(file)
--- a/
src/xmlpatterns/expr/qcontextitem.cpp
+++ b/
src/xmlpatterns/expr/qcontextitem.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qcontextitem_p.h
b/src/xmlpatterns/expr/qcontextitem_p.h
index
6b30ada
..
fa3a0e6
100644
(file)
--- a/
src/xmlpatterns/expr/qcontextitem_p.h
+++ b/
src/xmlpatterns/expr/qcontextitem_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qcopyof.cpp
b/src/xmlpatterns/expr/qcopyof.cpp
index
8c8710d
..
1567e24
100644
(file)
--- a/
src/xmlpatterns/expr/qcopyof.cpp
+++ b/
src/xmlpatterns/expr/qcopyof.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qcopyof_p.h
b/src/xmlpatterns/expr/qcopyof_p.h
index
053bcfd
..
ff9eeb6
100644
(file)
--- a/
src/xmlpatterns/expr/qcopyof_p.h
+++ b/
src/xmlpatterns/expr/qcopyof_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qcurrentitemstore.cpp
b/src/xmlpatterns/expr/qcurrentitemstore.cpp
index
64434cd
..
6e6056a
100644
(file)
--- a/
src/xmlpatterns/expr/qcurrentitemstore.cpp
+++ b/
src/xmlpatterns/expr/qcurrentitemstore.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qcurrentitemstore_p.h
b/src/xmlpatterns/expr/qcurrentitemstore_p.h
index
97cc11e
..
42d492f
100644
(file)
--- a/
src/xmlpatterns/expr/qcurrentitemstore_p.h
+++ b/
src/xmlpatterns/expr/qcurrentitemstore_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qdocumentconstructor.cpp
b/src/xmlpatterns/expr/qdocumentconstructor.cpp
index
867e851
..
92fac34
100644
(file)
--- a/
src/xmlpatterns/expr/qdocumentconstructor.cpp
+++ b/
src/xmlpatterns/expr/qdocumentconstructor.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qdocumentconstructor_p.h
b/src/xmlpatterns/expr/qdocumentconstructor_p.h
index
d1dafc1
..
976eae0
100644
(file)
--- a/
src/xmlpatterns/expr/qdocumentconstructor_p.h
+++ b/
src/xmlpatterns/expr/qdocumentconstructor_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qdocumentcontentvalidator.cpp
b/src/xmlpatterns/expr/qdocumentcontentvalidator.cpp
index
e322665
..
1da2567
100644
(file)
--- a/
src/xmlpatterns/expr/qdocumentcontentvalidator.cpp
+++ b/
src/xmlpatterns/expr/qdocumentcontentvalidator.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h
b/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h
index
09ca9cb
..
468e199
100644
(file)
--- a/
src/xmlpatterns/expr/qdocumentcontentvalidator_p.h
+++ b/
src/xmlpatterns/expr/qdocumentcontentvalidator_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qdynamiccontextstore.cpp
b/src/xmlpatterns/expr/qdynamiccontextstore.cpp
index
89b1da4
..
3879cd6
100644
(file)
--- a/
src/xmlpatterns/expr/qdynamiccontextstore.cpp
+++ b/
src/xmlpatterns/expr/qdynamiccontextstore.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qdynamiccontextstore_p.h
b/src/xmlpatterns/expr/qdynamiccontextstore_p.h
index
7d3627d
..
d76e130
100644
(file)
--- a/
src/xmlpatterns/expr/qdynamiccontextstore_p.h
+++ b/
src/xmlpatterns/expr/qdynamiccontextstore_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qelementconstructor.cpp
b/src/xmlpatterns/expr/qelementconstructor.cpp
index
b1d556c
..
8d98232
100644
(file)
--- a/
src/xmlpatterns/expr/qelementconstructor.cpp
+++ b/
src/xmlpatterns/expr/qelementconstructor.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qelementconstructor_p.h
b/src/xmlpatterns/expr/qelementconstructor_p.h
index
46b0a8f
..
e14580b
100644
(file)
--- a/
src/xmlpatterns/expr/qelementconstructor_p.h
+++ b/
src/xmlpatterns/expr/qelementconstructor_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qemptycontainer.cpp
b/src/xmlpatterns/expr/qemptycontainer.cpp
index
1c70e70
..
d711b87
100644
(file)
--- a/
src/xmlpatterns/expr/qemptycontainer.cpp
+++ b/
src/xmlpatterns/expr/qemptycontainer.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qemptycontainer_p.h
b/src/xmlpatterns/expr/qemptycontainer_p.h
index
c042cbf
..
990e51f
100644
(file)
--- a/
src/xmlpatterns/expr/qemptycontainer_p.h
+++ b/
src/xmlpatterns/expr/qemptycontainer_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qemptysequence.cpp
b/src/xmlpatterns/expr/qemptysequence.cpp
index
afbe665
..
eb8d253
100644
(file)
--- a/
src/xmlpatterns/expr/qemptysequence.cpp
+++ b/
src/xmlpatterns/expr/qemptysequence.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qemptysequence_p.h
b/src/xmlpatterns/expr/qemptysequence_p.h
index
da28dd4
..
6ca34f1
100644
(file)
--- a/
src/xmlpatterns/expr/qemptysequence_p.h
+++ b/
src/xmlpatterns/expr/qemptysequence_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qevaluationcache_p.h
b/src/xmlpatterns/expr/qevaluationcache_p.h
index
4f0d59b
..
6f49115
100644
(file)
--- a/
src/xmlpatterns/expr/qevaluationcache_p.h
+++ b/
src/xmlpatterns/expr/qevaluationcache_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qevaluationcache_tpl_p.h
b/src/xmlpatterns/expr/qevaluationcache_tpl_p.h
index
11c6141
..
286c077
100644
(file)
--- a/
src/xmlpatterns/expr/qevaluationcache_tpl_p.h
+++ b/
src/xmlpatterns/expr/qevaluationcache_tpl_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qexpression.cpp
b/src/xmlpatterns/expr/qexpression.cpp
index
31f03a5
..
b87f094
100644
(file)
--- a/
src/xmlpatterns/expr/qexpression.cpp
+++ b/
src/xmlpatterns/expr/qexpression.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qexpression_p.h
b/src/xmlpatterns/expr/qexpression_p.h
index
0016071
..
002092a
100644
(file)
--- a/
src/xmlpatterns/expr/qexpression_p.h
+++ b/
src/xmlpatterns/expr/qexpression_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qexpressiondispatch_p.h
b/src/xmlpatterns/expr/qexpressiondispatch_p.h
index
b0f532b
..
552fff3
100644
(file)
--- a/
src/xmlpatterns/expr/qexpressiondispatch_p.h
+++ b/
src/xmlpatterns/expr/qexpressiondispatch_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qexpressionfactory.cpp
b/src/xmlpatterns/expr/qexpressionfactory.cpp
index
24f95f6
..
22e9227
100644
(file)
--- a/
src/xmlpatterns/expr/qexpressionfactory.cpp
+++ b/
src/xmlpatterns/expr/qexpressionfactory.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qexpressionfactory_p.h
b/src/xmlpatterns/expr/qexpressionfactory_p.h
index
a3b1b35
..
a257932
100644
(file)
--- a/
src/xmlpatterns/expr/qexpressionfactory_p.h
+++ b/
src/xmlpatterns/expr/qexpressionfactory_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qexpressionsequence.cpp
b/src/xmlpatterns/expr/qexpressionsequence.cpp
index
2e514da
..
5060cdb
100644
(file)
--- a/
src/xmlpatterns/expr/qexpressionsequence.cpp
+++ b/
src/xmlpatterns/expr/qexpressionsequence.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qexpressionsequence_p.h
b/src/xmlpatterns/expr/qexpressionsequence_p.h
index
162eb49
..
28b096b
100644
(file)
--- a/
src/xmlpatterns/expr/qexpressionsequence_p.h
+++ b/
src/xmlpatterns/expr/qexpressionsequence_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qexpressionvariablereference.cpp
b/src/xmlpatterns/expr/qexpressionvariablereference.cpp
index
98d5c20
..
0ff0a50
100644
(file)
--- a/
src/xmlpatterns/expr/qexpressionvariablereference.cpp
+++ b/
src/xmlpatterns/expr/qexpressionvariablereference.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qexpressionvariablereference_p.h
b/src/xmlpatterns/expr/qexpressionvariablereference_p.h
index
b8bc338
..
88c3b94
100644
(file)
--- a/
src/xmlpatterns/expr/qexpressionvariablereference_p.h
+++ b/
src/xmlpatterns/expr/qexpressionvariablereference_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qexternalvariableloader.cpp
b/src/xmlpatterns/expr/qexternalvariableloader.cpp
index
73b7aba
..
1f69441
100644
(file)
--- a/
src/xmlpatterns/expr/qexternalvariableloader.cpp
+++ b/
src/xmlpatterns/expr/qexternalvariableloader.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qexternalvariableloader_p.h
b/src/xmlpatterns/expr/qexternalvariableloader_p.h
index
8e493de
..
323b054
100644
(file)
--- a/
src/xmlpatterns/expr/qexternalvariableloader_p.h
+++ b/
src/xmlpatterns/expr/qexternalvariableloader_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qexternalvariablereference.cpp
b/src/xmlpatterns/expr/qexternalvariablereference.cpp
index
6a9d06c
..
6cf4d41
100644
(file)
--- a/
src/xmlpatterns/expr/qexternalvariablereference.cpp
+++ b/
src/xmlpatterns/expr/qexternalvariablereference.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qexternalvariablereference_p.h
b/src/xmlpatterns/expr/qexternalvariablereference_p.h
index
27f02a8
..
8ba1141
100644
(file)
--- a/
src/xmlpatterns/expr/qexternalvariablereference_p.h
+++ b/
src/xmlpatterns/expr/qexternalvariablereference_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qfirstitempredicate.cpp
b/src/xmlpatterns/expr/qfirstitempredicate.cpp
index
eb45543
..
55cec3e
100644
(file)
--- a/
src/xmlpatterns/expr/qfirstitempredicate.cpp
+++ b/
src/xmlpatterns/expr/qfirstitempredicate.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qfirstitempredicate_p.h
b/src/xmlpatterns/expr/qfirstitempredicate_p.h
index
f48bfa5
..
321c53b
100644
(file)
--- a/
src/xmlpatterns/expr/qfirstitempredicate_p.h
+++ b/
src/xmlpatterns/expr/qfirstitempredicate_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qforclause.cpp
b/src/xmlpatterns/expr/qforclause.cpp
index
950a918
..
56e4467
100644
(file)
--- a/
src/xmlpatterns/expr/qforclause.cpp
+++ b/
src/xmlpatterns/expr/qforclause.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qforclause_p.h
b/src/xmlpatterns/expr/qforclause_p.h
index
03aa4c9
..
c416ea4
100644
(file)
--- a/
src/xmlpatterns/expr/qforclause_p.h
+++ b/
src/xmlpatterns/expr/qforclause_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qgeneralcomparison.cpp
b/src/xmlpatterns/expr/qgeneralcomparison.cpp
index
4747a2c
..
ae62285
100644
(file)
--- a/
src/xmlpatterns/expr/qgeneralcomparison.cpp
+++ b/
src/xmlpatterns/expr/qgeneralcomparison.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qgeneralcomparison_p.h
b/src/xmlpatterns/expr/qgeneralcomparison_p.h
index
c97610f
..
3aa2955
100644
(file)
--- a/
src/xmlpatterns/expr/qgeneralcomparison_p.h
+++ b/
src/xmlpatterns/expr/qgeneralcomparison_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qgenericpredicate.cpp
b/src/xmlpatterns/expr/qgenericpredicate.cpp
index
20a164f
..
9bc03c7
100644
(file)
--- a/
src/xmlpatterns/expr/qgenericpredicate.cpp
+++ b/
src/xmlpatterns/expr/qgenericpredicate.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qgenericpredicate_p.h
b/src/xmlpatterns/expr/qgenericpredicate_p.h
index
c319440
..
ab8ff75
100644
(file)
--- a/
src/xmlpatterns/expr/qgenericpredicate_p.h
+++ b/
src/xmlpatterns/expr/qgenericpredicate_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qifthenclause.cpp
b/src/xmlpatterns/expr/qifthenclause.cpp
index
5600a01
..
294cdd1
100644
(file)
--- a/
src/xmlpatterns/expr/qifthenclause.cpp
+++ b/
src/xmlpatterns/expr/qifthenclause.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qifthenclause_p.h
b/src/xmlpatterns/expr/qifthenclause_p.h
index
95eb5db
..
ba80804
100644
(file)
--- a/
src/xmlpatterns/expr/qifthenclause_p.h
+++ b/
src/xmlpatterns/expr/qifthenclause_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qinstanceof.cpp
b/src/xmlpatterns/expr/qinstanceof.cpp
index
f06038a
..
b82451b
100644
(file)
--- a/
src/xmlpatterns/expr/qinstanceof.cpp
+++ b/
src/xmlpatterns/expr/qinstanceof.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qinstanceof_p.h
b/src/xmlpatterns/expr/qinstanceof_p.h
index
7d33ebc
..
bd4290f
100644
(file)
--- a/
src/xmlpatterns/expr/qinstanceof_p.h
+++ b/
src/xmlpatterns/expr/qinstanceof_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qletclause.cpp
b/src/xmlpatterns/expr/qletclause.cpp
index
fd3ce55
..
3b3ee07
100644
(file)
--- a/
src/xmlpatterns/expr/qletclause.cpp
+++ b/
src/xmlpatterns/expr/qletclause.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qletclause_p.h
b/src/xmlpatterns/expr/qletclause_p.h
index
7ccc998
..
63ebd34
100644
(file)
--- a/
src/xmlpatterns/expr/qletclause_p.h
+++ b/
src/xmlpatterns/expr/qletclause_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qliteral.cpp
b/src/xmlpatterns/expr/qliteral.cpp
index
647612d
..
365931a
100644
(file)
--- a/
src/xmlpatterns/expr/qliteral.cpp
+++ b/
src/xmlpatterns/expr/qliteral.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qliteral_p.h
b/src/xmlpatterns/expr/qliteral_p.h
index
3ad1279
..
aefa8d1
100644
(file)
--- a/
src/xmlpatterns/expr/qliteral_p.h
+++ b/
src/xmlpatterns/expr/qliteral_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qliteralsequence.cpp
b/src/xmlpatterns/expr/qliteralsequence.cpp
index
fffd632
..
9b60575
100644
(file)
--- a/
src/xmlpatterns/expr/qliteralsequence.cpp
+++ b/
src/xmlpatterns/expr/qliteralsequence.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qliteralsequence_p.h
b/src/xmlpatterns/expr/qliteralsequence_p.h
index
2bd84b5
..
32921c8
100644
(file)
--- a/
src/xmlpatterns/expr/qliteralsequence_p.h
+++ b/
src/xmlpatterns/expr/qliteralsequence_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qnamespaceconstructor.cpp
b/src/xmlpatterns/expr/qnamespaceconstructor.cpp
index
9c31ec3
..
8cf0102
100644
(file)
--- a/
src/xmlpatterns/expr/qnamespaceconstructor.cpp
+++ b/
src/xmlpatterns/expr/qnamespaceconstructor.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qnamespaceconstructor_p.h
b/src/xmlpatterns/expr/qnamespaceconstructor_p.h
index
da41011
..
0e8c9a0
100644
(file)
--- a/
src/xmlpatterns/expr/qnamespaceconstructor_p.h
+++ b/
src/xmlpatterns/expr/qnamespaceconstructor_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qncnameconstructor.cpp
b/src/xmlpatterns/expr/qncnameconstructor.cpp
index
ed5ca4e
..
ce5cfd9
100644
(file)
--- a/
src/xmlpatterns/expr/qncnameconstructor.cpp
+++ b/
src/xmlpatterns/expr/qncnameconstructor.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qncnameconstructor_p.h
b/src/xmlpatterns/expr/qncnameconstructor_p.h
index
cd03224
..
110205d
100644
(file)
--- a/
src/xmlpatterns/expr/qncnameconstructor_p.h
+++ b/
src/xmlpatterns/expr/qncnameconstructor_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qnodecomparison.cpp
b/src/xmlpatterns/expr/qnodecomparison.cpp
index
7d50c28
..
f8ca0df
100644
(file)
--- a/
src/xmlpatterns/expr/qnodecomparison.cpp
+++ b/
src/xmlpatterns/expr/qnodecomparison.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qnodecomparison_p.h
b/src/xmlpatterns/expr/qnodecomparison_p.h
index
c01891c
..
1844d01
100644
(file)
--- a/
src/xmlpatterns/expr/qnodecomparison_p.h
+++ b/
src/xmlpatterns/expr/qnodecomparison_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qnodesort.cpp
b/src/xmlpatterns/expr/qnodesort.cpp
index
3649df5
..
15fd2bb
100644
(file)
--- a/
src/xmlpatterns/expr/qnodesort.cpp
+++ b/
src/xmlpatterns/expr/qnodesort.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qnodesort_p.h
b/src/xmlpatterns/expr/qnodesort_p.h
index
1ee70c4
..
8cf620b
100644
(file)
--- a/
src/xmlpatterns/expr/qnodesort_p.h
+++ b/
src/xmlpatterns/expr/qnodesort_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qoperandsiterator_p.h
b/src/xmlpatterns/expr/qoperandsiterator_p.h
index
22bbec9
..
526f1f1
100644
(file)
--- a/
src/xmlpatterns/expr/qoperandsiterator_p.h
+++ b/
src/xmlpatterns/expr/qoperandsiterator_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qoptimizationpasses.cpp
b/src/xmlpatterns/expr/qoptimizationpasses.cpp
index
04762e5
..
f222cd3
100644
(file)
--- a/
src/xmlpatterns/expr/qoptimizationpasses.cpp
+++ b/
src/xmlpatterns/expr/qoptimizationpasses.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qoptimizationpasses_p.h
b/src/xmlpatterns/expr/qoptimizationpasses_p.h
index
48be9fa
..
e78f39e
100644
(file)
--- a/
src/xmlpatterns/expr/qoptimizationpasses_p.h
+++ b/
src/xmlpatterns/expr/qoptimizationpasses_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qoptimizerblocks.cpp
b/src/xmlpatterns/expr/qoptimizerblocks.cpp
index
4f55844
..
c6d75c1
100644
(file)
--- a/
src/xmlpatterns/expr/qoptimizerblocks.cpp
+++ b/
src/xmlpatterns/expr/qoptimizerblocks.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qoptimizerblocks_p.h
b/src/xmlpatterns/expr/qoptimizerblocks_p.h
index
3f1c47a
..
57552d1
100644
(file)
--- a/
src/xmlpatterns/expr/qoptimizerblocks_p.h
+++ b/
src/xmlpatterns/expr/qoptimizerblocks_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qoptimizerframework.cpp
b/src/xmlpatterns/expr/qoptimizerframework.cpp
index
8065c63
..
7f969fb
100644
(file)
--- a/
src/xmlpatterns/expr/qoptimizerframework.cpp
+++ b/
src/xmlpatterns/expr/qoptimizerframework.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qoptimizerframework_p.h
b/src/xmlpatterns/expr/qoptimizerframework_p.h
index
65f6978
..
4f91457
100644
(file)
--- a/
src/xmlpatterns/expr/qoptimizerframework_p.h
+++ b/
src/xmlpatterns/expr/qoptimizerframework_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qorderby.cpp
b/src/xmlpatterns/expr/qorderby.cpp
index
d8855de
..
b293e58
100644
(file)
--- a/
src/xmlpatterns/expr/qorderby.cpp
+++ b/
src/xmlpatterns/expr/qorderby.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qorderby_p.h
b/src/xmlpatterns/expr/qorderby_p.h
index
1333e91
..
21216e5
100644
(file)
--- a/
src/xmlpatterns/expr/qorderby_p.h
+++ b/
src/xmlpatterns/expr/qorderby_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qorexpression.cpp
b/src/xmlpatterns/expr/qorexpression.cpp
index
9337261
..
84208ae
100644
(file)
--- a/
src/xmlpatterns/expr/qorexpression.cpp
+++ b/
src/xmlpatterns/expr/qorexpression.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qorexpression_p.h
b/src/xmlpatterns/expr/qorexpression_p.h
index
7081cb1
..
1b0ec2e
100644
(file)
--- a/
src/xmlpatterns/expr/qorexpression_p.h
+++ b/
src/xmlpatterns/expr/qorexpression_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qpaircontainer.cpp
b/src/xmlpatterns/expr/qpaircontainer.cpp
index
50240f5
..
dec6790
100644
(file)
--- a/
src/xmlpatterns/expr/qpaircontainer.cpp
+++ b/
src/xmlpatterns/expr/qpaircontainer.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qpaircontainer_p.h
b/src/xmlpatterns/expr/qpaircontainer_p.h
index
e8be81d
..
a54d7b0
100644
(file)
--- a/
src/xmlpatterns/expr/qpaircontainer_p.h
+++ b/
src/xmlpatterns/expr/qpaircontainer_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qparentnodeaxis.cpp
b/src/xmlpatterns/expr/qparentnodeaxis.cpp
index
f47b03a
..
11e3417
100644
(file)
--- a/
src/xmlpatterns/expr/qparentnodeaxis.cpp
+++ b/
src/xmlpatterns/expr/qparentnodeaxis.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qparentnodeaxis_p.h
b/src/xmlpatterns/expr/qparentnodeaxis_p.h
index
4ea0568
..
f992443
100644
(file)
--- a/
src/xmlpatterns/expr/qparentnodeaxis_p.h
+++ b/
src/xmlpatterns/expr/qparentnodeaxis_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qpath.cpp
b/src/xmlpatterns/expr/qpath.cpp
index
5de6277
..
5beca5f
100644
(file)
--- a/
src/xmlpatterns/expr/qpath.cpp
+++ b/
src/xmlpatterns/expr/qpath.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qpath_p.h
b/src/xmlpatterns/expr/qpath_p.h
index
276286f
..
d374dd9
100644
(file)
--- a/
src/xmlpatterns/expr/qpath_p.h
+++ b/
src/xmlpatterns/expr/qpath_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qpositionalvariablereference.cpp
b/src/xmlpatterns/expr/qpositionalvariablereference.cpp
index
7513d2c
..
8f6d784
100644
(file)
--- a/
src/xmlpatterns/expr/qpositionalvariablereference.cpp
+++ b/
src/xmlpatterns/expr/qpositionalvariablereference.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qpositionalvariablereference_p.h
b/src/xmlpatterns/expr/qpositionalvariablereference_p.h
index
ab5a542
..
1315c3c
100644
(file)
--- a/
src/xmlpatterns/expr/qpositionalvariablereference_p.h
+++ b/
src/xmlpatterns/expr/qpositionalvariablereference_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qprocessinginstructionconstructor.cpp
b/src/xmlpatterns/expr/qprocessinginstructionconstructor.cpp
index
849e9e1
..
de9f07c
100644
(file)
--- a/
src/xmlpatterns/expr/qprocessinginstructionconstructor.cpp
+++ b/
src/xmlpatterns/expr/qprocessinginstructionconstructor.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h
b/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h
index
597c3a5
..
6e22f74
100644
(file)
--- a/
src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h
+++ b/
src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qqnameconstructor.cpp
b/src/xmlpatterns/expr/qqnameconstructor.cpp
index
eb36622
..
584a9bb
100644
(file)
--- a/
src/xmlpatterns/expr/qqnameconstructor.cpp
+++ b/
src/xmlpatterns/expr/qqnameconstructor.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qqnameconstructor_p.h
b/src/xmlpatterns/expr/qqnameconstructor_p.h
index
83d9789
..
74cafac
100644
(file)
--- a/
src/xmlpatterns/expr/qqnameconstructor_p.h
+++ b/
src/xmlpatterns/expr/qqnameconstructor_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qquantifiedexpression.cpp
b/src/xmlpatterns/expr/qquantifiedexpression.cpp
index
6ec9c21
..
860b8b5
100644
(file)
--- a/
src/xmlpatterns/expr/qquantifiedexpression.cpp
+++ b/
src/xmlpatterns/expr/qquantifiedexpression.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qquantifiedexpression_p.h
b/src/xmlpatterns/expr/qquantifiedexpression_p.h
index
af72e94
..
4fc130c
100644
(file)
--- a/
src/xmlpatterns/expr/qquantifiedexpression_p.h
+++ b/
src/xmlpatterns/expr/qquantifiedexpression_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qrangeexpression.cpp
b/src/xmlpatterns/expr/qrangeexpression.cpp
index
3fcc1d4
..
0054c5f
100644
(file)
--- a/
src/xmlpatterns/expr/qrangeexpression.cpp
+++ b/
src/xmlpatterns/expr/qrangeexpression.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qrangeexpression_p.h
b/src/xmlpatterns/expr/qrangeexpression_p.h
index
a7cf82f
..
0a8229d
100644
(file)
--- a/
src/xmlpatterns/expr/qrangeexpression_p.h
+++ b/
src/xmlpatterns/expr/qrangeexpression_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qrangevariablereference.cpp
b/src/xmlpatterns/expr/qrangevariablereference.cpp
index
414ac34
..
b744927
100644
(file)
--- a/
src/xmlpatterns/expr/qrangevariablereference.cpp
+++ b/
src/xmlpatterns/expr/qrangevariablereference.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qrangevariablereference_p.h
b/src/xmlpatterns/expr/qrangevariablereference_p.h
index
d0b4c49
..
39cb308
100644
(file)
--- a/
src/xmlpatterns/expr/qrangevariablereference_p.h
+++ b/
src/xmlpatterns/expr/qrangevariablereference_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qreturnorderby.cpp
b/src/xmlpatterns/expr/qreturnorderby.cpp
index
62a0301
..
3f6ddcf
100644
(file)
--- a/
src/xmlpatterns/expr/qreturnorderby.cpp
+++ b/
src/xmlpatterns/expr/qreturnorderby.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qreturnorderby_p.h
b/src/xmlpatterns/expr/qreturnorderby_p.h
index
d9a49f3
..
4283c14
100644
(file)
--- a/
src/xmlpatterns/expr/qreturnorderby_p.h
+++ b/
src/xmlpatterns/expr/qreturnorderby_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qsimplecontentconstructor.cpp
b/src/xmlpatterns/expr/qsimplecontentconstructor.cpp
index
f5c7c46
..
8e64a45
100644
(file)
--- a/
src/xmlpatterns/expr/qsimplecontentconstructor.cpp
+++ b/
src/xmlpatterns/expr/qsimplecontentconstructor.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qsimplecontentconstructor_p.h
b/src/xmlpatterns/expr/qsimplecontentconstructor_p.h
index
44da906
..
4a1ccc2
100644
(file)
--- a/
src/xmlpatterns/expr/qsimplecontentconstructor_p.h
+++ b/
src/xmlpatterns/expr/qsimplecontentconstructor_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qsinglecontainer.cpp
b/src/xmlpatterns/expr/qsinglecontainer.cpp
index
48d266b
..
5f93b9b
100644
(file)
--- a/
src/xmlpatterns/expr/qsinglecontainer.cpp
+++ b/
src/xmlpatterns/expr/qsinglecontainer.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qsinglecontainer_p.h
b/src/xmlpatterns/expr/qsinglecontainer_p.h
index
a50e187
..
96f67c7
100644
(file)
--- a/
src/xmlpatterns/expr/qsinglecontainer_p.h
+++ b/
src/xmlpatterns/expr/qsinglecontainer_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qsourcelocationreflection.cpp
b/src/xmlpatterns/expr/qsourcelocationreflection.cpp
index
b73247d
..
e60276f
100644
(file)
--- a/
src/xmlpatterns/expr/qsourcelocationreflection.cpp
+++ b/
src/xmlpatterns/expr/qsourcelocationreflection.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qsourcelocationreflection_p.h
b/src/xmlpatterns/expr/qsourcelocationreflection_p.h
index
72f644e
..
6fbbcdb
100644
(file)
--- a/
src/xmlpatterns/expr/qsourcelocationreflection_p.h
+++ b/
src/xmlpatterns/expr/qsourcelocationreflection_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qstaticbaseuristore.cpp
b/src/xmlpatterns/expr/qstaticbaseuristore.cpp
index
d828334
..
2df89df
100644
(file)
--- a/
src/xmlpatterns/expr/qstaticbaseuristore.cpp
+++ b/
src/xmlpatterns/expr/qstaticbaseuristore.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qstaticbaseuristore_p.h
b/src/xmlpatterns/expr/qstaticbaseuristore_p.h
index
4b0d9a3
..
82c385c
100644
(file)
--- a/
src/xmlpatterns/expr/qstaticbaseuristore_p.h
+++ b/
src/xmlpatterns/expr/qstaticbaseuristore_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qstaticcompatibilitystore.cpp
b/src/xmlpatterns/expr/qstaticcompatibilitystore.cpp
index
f0d4f83
..
516c4f0
100644
(file)
--- a/
src/xmlpatterns/expr/qstaticcompatibilitystore.cpp
+++ b/
src/xmlpatterns/expr/qstaticcompatibilitystore.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h
b/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h
index
0b1d3a9
..
e1482fe
100644
(file)
--- a/
src/xmlpatterns/expr/qstaticcompatibilitystore_p.h
+++ b/
src/xmlpatterns/expr/qstaticcompatibilitystore_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qtemplate.cpp
b/src/xmlpatterns/expr/qtemplate.cpp
index
ead13ec
..
c4c9fd0
100644
(file)
--- a/
src/xmlpatterns/expr/qtemplate.cpp
+++ b/
src/xmlpatterns/expr/qtemplate.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qtemplate_p.h
b/src/xmlpatterns/expr/qtemplate_p.h
index
5d1c257
..
1881a16
100644
(file)
--- a/
src/xmlpatterns/expr/qtemplate_p.h
+++ b/
src/xmlpatterns/expr/qtemplate_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qtemplateinvoker.cpp
b/src/xmlpatterns/expr/qtemplateinvoker.cpp
index
01c34e5
..
6609c90
100644
(file)
--- a/
src/xmlpatterns/expr/qtemplateinvoker.cpp
+++ b/
src/xmlpatterns/expr/qtemplateinvoker.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qtemplateinvoker_p.h
b/src/xmlpatterns/expr/qtemplateinvoker_p.h
index
bc8aa67
..
b2c3e1f
100644
(file)
--- a/
src/xmlpatterns/expr/qtemplateinvoker_p.h
+++ b/
src/xmlpatterns/expr/qtemplateinvoker_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qtemplatemode.cpp
b/src/xmlpatterns/expr/qtemplatemode.cpp
index
88b707a
..
d53ebc0
100644
(file)
--- a/
src/xmlpatterns/expr/qtemplatemode.cpp
+++ b/
src/xmlpatterns/expr/qtemplatemode.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qtemplatemode_p.h
b/src/xmlpatterns/expr/qtemplatemode_p.h
index
786f2b9
..
b7e2af5
100644
(file)
--- a/
src/xmlpatterns/expr/qtemplatemode_p.h
+++ b/
src/xmlpatterns/expr/qtemplatemode_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qtemplateparameterreference.cpp
b/src/xmlpatterns/expr/qtemplateparameterreference.cpp
index
27b5ef7
..
6893ed8
100644
(file)
--- a/
src/xmlpatterns/expr/qtemplateparameterreference.cpp
+++ b/
src/xmlpatterns/expr/qtemplateparameterreference.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qtemplateparameterreference_p.h
b/src/xmlpatterns/expr/qtemplateparameterreference_p.h
index
d8ec9f0
..
3ce9194
100644
(file)
--- a/
src/xmlpatterns/expr/qtemplateparameterreference_p.h
+++ b/
src/xmlpatterns/expr/qtemplateparameterreference_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qtemplatepattern_p.h
b/src/xmlpatterns/expr/qtemplatepattern_p.h
index
1e182be
..
9f79ac9
100644
(file)
--- a/
src/xmlpatterns/expr/qtemplatepattern_p.h
+++ b/
src/xmlpatterns/expr/qtemplatepattern_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qtextnodeconstructor.cpp
b/src/xmlpatterns/expr/qtextnodeconstructor.cpp
index
67d79e8
..
0517bca
100644
(file)
--- a/
src/xmlpatterns/expr/qtextnodeconstructor.cpp
+++ b/
src/xmlpatterns/expr/qtextnodeconstructor.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qtextnodeconstructor_p.h
b/src/xmlpatterns/expr/qtextnodeconstructor_p.h
index
e303897
..
8662213
100644
(file)
--- a/
src/xmlpatterns/expr/qtextnodeconstructor_p.h
+++ b/
src/xmlpatterns/expr/qtextnodeconstructor_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qtreatas.cpp
b/src/xmlpatterns/expr/qtreatas.cpp
index
c674662
..
455a8d5
100644
(file)
--- a/
src/xmlpatterns/expr/qtreatas.cpp
+++ b/
src/xmlpatterns/expr/qtreatas.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qtreatas_p.h
b/src/xmlpatterns/expr/qtreatas_p.h
index
58f0cb6
..
5ed5ae7
100644
(file)
--- a/
src/xmlpatterns/expr/qtreatas_p.h
+++ b/
src/xmlpatterns/expr/qtreatas_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qtriplecontainer.cpp
b/src/xmlpatterns/expr/qtriplecontainer.cpp
index
a417809
..
935bb77
100644
(file)
--- a/
src/xmlpatterns/expr/qtriplecontainer.cpp
+++ b/
src/xmlpatterns/expr/qtriplecontainer.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qtriplecontainer_p.h
b/src/xmlpatterns/expr/qtriplecontainer_p.h
index
b07571f
..
64eac77
100644
(file)
--- a/
src/xmlpatterns/expr/qtriplecontainer_p.h
+++ b/
src/xmlpatterns/expr/qtriplecontainer_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qtruthpredicate.cpp
b/src/xmlpatterns/expr/qtruthpredicate.cpp
index
20f1539
..
19e3462
100644
(file)
--- a/
src/xmlpatterns/expr/qtruthpredicate.cpp
+++ b/
src/xmlpatterns/expr/qtruthpredicate.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qtruthpredicate_p.h
b/src/xmlpatterns/expr/qtruthpredicate_p.h
index
8eb69fb
..
6b8a90c
100644
(file)
--- a/
src/xmlpatterns/expr/qtruthpredicate_p.h
+++ b/
src/xmlpatterns/expr/qtruthpredicate_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qunaryexpression.cpp
b/src/xmlpatterns/expr/qunaryexpression.cpp
index
f20f266
..
04e29cb
100644
(file)
--- a/
src/xmlpatterns/expr/qunaryexpression.cpp
+++ b/
src/xmlpatterns/expr/qunaryexpression.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qunaryexpression_p.h
b/src/xmlpatterns/expr/qunaryexpression_p.h
index
52909aa
..
66b4cea
100644
(file)
--- a/
src/xmlpatterns/expr/qunaryexpression_p.h
+++ b/
src/xmlpatterns/expr/qunaryexpression_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qunlimitedcontainer.cpp
b/src/xmlpatterns/expr/qunlimitedcontainer.cpp
index
448ebf1
..
388c7db
100644
(file)
--- a/
src/xmlpatterns/expr/qunlimitedcontainer.cpp
+++ b/
src/xmlpatterns/expr/qunlimitedcontainer.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qunlimitedcontainer_p.h
b/src/xmlpatterns/expr/qunlimitedcontainer_p.h
index
abf699d
..
d514549
100644
(file)
--- a/
src/xmlpatterns/expr/qunlimitedcontainer_p.h
+++ b/
src/xmlpatterns/expr/qunlimitedcontainer_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qunresolvedvariablereference.cpp
b/src/xmlpatterns/expr/qunresolvedvariablereference.cpp
index
346c67a
..
3d7e46f
100644
(file)
--- a/
src/xmlpatterns/expr/qunresolvedvariablereference.cpp
+++ b/
src/xmlpatterns/expr/qunresolvedvariablereference.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qunresolvedvariablereference_p.h
b/src/xmlpatterns/expr/qunresolvedvariablereference_p.h
index
08a31eb
..
fbf612b
100644
(file)
--- a/
src/xmlpatterns/expr/qunresolvedvariablereference_p.h
+++ b/
src/xmlpatterns/expr/qunresolvedvariablereference_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/quserfunction.cpp
b/src/xmlpatterns/expr/quserfunction.cpp
index
743d362
..
663d014
100644
(file)
--- a/
src/xmlpatterns/expr/quserfunction.cpp
+++ b/
src/xmlpatterns/expr/quserfunction.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/quserfunction_p.h
b/src/xmlpatterns/expr/quserfunction_p.h
index
eaa0895
..
f00f4b1
100644
(file)
--- a/
src/xmlpatterns/expr/quserfunction_p.h
+++ b/
src/xmlpatterns/expr/quserfunction_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/quserfunctioncallsite.cpp
b/src/xmlpatterns/expr/quserfunctioncallsite.cpp
index
88d4745
..
55f7b8e
100644
(file)
--- a/
src/xmlpatterns/expr/quserfunctioncallsite.cpp
+++ b/
src/xmlpatterns/expr/quserfunctioncallsite.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/quserfunctioncallsite_p.h
b/src/xmlpatterns/expr/quserfunctioncallsite_p.h
index
4c2249b
..
3ec04d6
100644
(file)
--- a/
src/xmlpatterns/expr/quserfunctioncallsite_p.h
+++ b/
src/xmlpatterns/expr/quserfunctioncallsite_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qvalidate.cpp
b/src/xmlpatterns/expr/qvalidate.cpp
index
11d6f32
..
febfb9a
100644
(file)
--- a/
src/xmlpatterns/expr/qvalidate.cpp
+++ b/
src/xmlpatterns/expr/qvalidate.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qvalidate_p.h
b/src/xmlpatterns/expr/qvalidate_p.h
index
52aa742
..
1a4404c
100644
(file)
--- a/
src/xmlpatterns/expr/qvalidate_p.h
+++ b/
src/xmlpatterns/expr/qvalidate_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qvaluecomparison.cpp
b/src/xmlpatterns/expr/qvaluecomparison.cpp
index
eb1bd3c
..
ceabbef
100644
(file)
--- a/
src/xmlpatterns/expr/qvaluecomparison.cpp
+++ b/
src/xmlpatterns/expr/qvaluecomparison.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qvaluecomparison_p.h
b/src/xmlpatterns/expr/qvaluecomparison_p.h
index
6e8b0d9
..
900f7f3
100644
(file)
--- a/
src/xmlpatterns/expr/qvaluecomparison_p.h
+++ b/
src/xmlpatterns/expr/qvaluecomparison_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qvariabledeclaration.cpp
b/src/xmlpatterns/expr/qvariabledeclaration.cpp
index
9903b93
..
b255647
100644
(file)
--- a/
src/xmlpatterns/expr/qvariabledeclaration.cpp
+++ b/
src/xmlpatterns/expr/qvariabledeclaration.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qvariabledeclaration_p.h
b/src/xmlpatterns/expr/qvariabledeclaration_p.h
index
56a6afe
..
77f7b89
100644
(file)
--- a/
src/xmlpatterns/expr/qvariabledeclaration_p.h
+++ b/
src/xmlpatterns/expr/qvariabledeclaration_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qvariablereference.cpp
b/src/xmlpatterns/expr/qvariablereference.cpp
index
7681b39
..
6191dc3
100644
(file)
--- a/
src/xmlpatterns/expr/qvariablereference.cpp
+++ b/
src/xmlpatterns/expr/qvariablereference.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qvariablereference_p.h
b/src/xmlpatterns/expr/qvariablereference_p.h
index
656f87e
..
972677e
100644
(file)
--- a/
src/xmlpatterns/expr/qvariablereference_p.h
+++ b/
src/xmlpatterns/expr/qvariablereference_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qwithparam_p.h
b/src/xmlpatterns/expr/qwithparam_p.h
index
7809fa6
..
b5f808f
100644
(file)
--- a/
src/xmlpatterns/expr/qwithparam_p.h
+++ b/
src/xmlpatterns/expr/qwithparam_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qxsltsimplecontentconstructor.cpp
b/src/xmlpatterns/expr/qxsltsimplecontentconstructor.cpp
index
6995c25
..
cf5bbc5
100644
(file)
--- a/
src/xmlpatterns/expr/qxsltsimplecontentconstructor.cpp
+++ b/
src/xmlpatterns/expr/qxsltsimplecontentconstructor.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h
b/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h
index
a5661d6
..
dd71f0d
100644
(file)
--- a/
src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h
+++ b/
src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qabstractfunctionfactory.cpp
b/src/xmlpatterns/functions/qabstractfunctionfactory.cpp
index
6e3cb2a
..
21683ef
100644
(file)
--- a/
src/xmlpatterns/functions/qabstractfunctionfactory.cpp
+++ b/
src/xmlpatterns/functions/qabstractfunctionfactory.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qabstractfunctionfactory_p.h
b/src/xmlpatterns/functions/qabstractfunctionfactory_p.h
index
fcc2c51
..
9d70d88
100644
(file)
--- a/
src/xmlpatterns/functions/qabstractfunctionfactory_p.h
+++ b/
src/xmlpatterns/functions/qabstractfunctionfactory_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qaccessorfns.cpp
b/src/xmlpatterns/functions/qaccessorfns.cpp
index
17917a7
..
11f204d
100644
(file)
--- a/
src/xmlpatterns/functions/qaccessorfns.cpp
+++ b/
src/xmlpatterns/functions/qaccessorfns.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qaccessorfns_p.h
b/src/xmlpatterns/functions/qaccessorfns_p.h
index
4448364
..
f2bb3ea
100644
(file)
--- a/
src/xmlpatterns/functions/qaccessorfns_p.h
+++ b/
src/xmlpatterns/functions/qaccessorfns_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qaggregatefns.cpp
b/src/xmlpatterns/functions/qaggregatefns.cpp
index
ada8338
..
bfcfb7d
100644
(file)
--- a/
src/xmlpatterns/functions/qaggregatefns.cpp
+++ b/
src/xmlpatterns/functions/qaggregatefns.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qaggregatefns_p.h
b/src/xmlpatterns/functions/qaggregatefns_p.h
index
d172f6a
..
055a2e5
100644
(file)
--- a/
src/xmlpatterns/functions/qaggregatefns_p.h
+++ b/
src/xmlpatterns/functions/qaggregatefns_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qaggregator.cpp
b/src/xmlpatterns/functions/qaggregator.cpp
index
2fc4855
..
c078bd3
100644
(file)
--- a/
src/xmlpatterns/functions/qaggregator.cpp
+++ b/
src/xmlpatterns/functions/qaggregator.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qaggregator_p.h
b/src/xmlpatterns/functions/qaggregator_p.h
index
7078546
..
1d8f079
100644
(file)
--- a/
src/xmlpatterns/functions/qaggregator_p.h
+++ b/
src/xmlpatterns/functions/qaggregator_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qassemblestringfns.cpp
b/src/xmlpatterns/functions/qassemblestringfns.cpp
index
1db8aea
..
0b40652
100644
(file)
--- a/
src/xmlpatterns/functions/qassemblestringfns.cpp
+++ b/
src/xmlpatterns/functions/qassemblestringfns.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qassemblestringfns_p.h
b/src/xmlpatterns/functions/qassemblestringfns_p.h
index
9a8f114
..
25fae15
100644
(file)
--- a/
src/xmlpatterns/functions/qassemblestringfns_p.h
+++ b/
src/xmlpatterns/functions/qassemblestringfns_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qbooleanfns.cpp
b/src/xmlpatterns/functions/qbooleanfns.cpp
index
fa10d04
..
6157de3
100644
(file)
--- a/
src/xmlpatterns/functions/qbooleanfns.cpp
+++ b/
src/xmlpatterns/functions/qbooleanfns.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qbooleanfns_p.h
b/src/xmlpatterns/functions/qbooleanfns_p.h
index
3c1db5b
..
0a7ef68
100644
(file)
--- a/
src/xmlpatterns/functions/qbooleanfns_p.h
+++ b/
src/xmlpatterns/functions/qbooleanfns_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qcomparescaseaware.cpp
b/src/xmlpatterns/functions/qcomparescaseaware.cpp
index
ae94a85
..
0468f7e
100644
(file)
--- a/
src/xmlpatterns/functions/qcomparescaseaware.cpp
+++ b/
src/xmlpatterns/functions/qcomparescaseaware.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qcomparescaseaware_p.h
b/src/xmlpatterns/functions/qcomparescaseaware_p.h
index
27c7ccc
..
06cdc93
100644
(file)
--- a/
src/xmlpatterns/functions/qcomparescaseaware_p.h
+++ b/
src/xmlpatterns/functions/qcomparescaseaware_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qcomparestringfns.cpp
b/src/xmlpatterns/functions/qcomparestringfns.cpp
index
d24db6f
..
da4c661
100644
(file)
--- a/
src/xmlpatterns/functions/qcomparestringfns.cpp
+++ b/
src/xmlpatterns/functions/qcomparestringfns.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qcomparestringfns_p.h
b/src/xmlpatterns/functions/qcomparestringfns_p.h
index
48d4e17
..
2e70fc7
100644
(file)
--- a/
src/xmlpatterns/functions/qcomparestringfns_p.h
+++ b/
src/xmlpatterns/functions/qcomparestringfns_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qcomparingaggregator_p.h
b/src/xmlpatterns/functions/qcomparingaggregator_p.h
index
c14d48e
..
4c74024
100644
(file)
--- a/
src/xmlpatterns/functions/qcomparingaggregator_p.h
+++ b/
src/xmlpatterns/functions/qcomparingaggregator_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qcomparingaggregator_tpl_p.h
b/src/xmlpatterns/functions/qcomparingaggregator_tpl_p.h
index
f8c8859
..
84b58dc
100644
(file)
--- a/
src/xmlpatterns/functions/qcomparingaggregator_tpl_p.h
+++ b/
src/xmlpatterns/functions/qcomparingaggregator_tpl_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qconstructorfunctionsfactory.cpp
b/src/xmlpatterns/functions/qconstructorfunctionsfactory.cpp
index
586233d
..
128611a
100644
(file)
--- a/
src/xmlpatterns/functions/qconstructorfunctionsfactory.cpp
+++ b/
src/xmlpatterns/functions/qconstructorfunctionsfactory.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h
b/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h
index
28f1f7b
..
9ef757d
100644
(file)
--- a/
src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h
+++ b/
src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qcontextfns.cpp
b/src/xmlpatterns/functions/qcontextfns.cpp
index
1563463
..
7d14a1a
100644
(file)
--- a/
src/xmlpatterns/functions/qcontextfns.cpp
+++ b/
src/xmlpatterns/functions/qcontextfns.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qcontextfns_p.h
b/src/xmlpatterns/functions/qcontextfns_p.h
index
9fad226
..
6f7dd0d
100644
(file)
--- a/
src/xmlpatterns/functions/qcontextfns_p.h
+++ b/
src/xmlpatterns/functions/qcontextfns_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qcontextnodechecker.cpp
b/src/xmlpatterns/functions/qcontextnodechecker.cpp
index
15c9061
..
d8b656e
100644
(file)
--- a/
src/xmlpatterns/functions/qcontextnodechecker.cpp
+++ b/
src/xmlpatterns/functions/qcontextnodechecker.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qcontextnodechecker_p.h
b/src/xmlpatterns/functions/qcontextnodechecker_p.h
index
332e02e
..
c6ceb37
100644
(file)
--- a/
src/xmlpatterns/functions/qcontextnodechecker_p.h
+++ b/
src/xmlpatterns/functions/qcontextnodechecker_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qcurrentfn.cpp
b/src/xmlpatterns/functions/qcurrentfn.cpp
index
cc69d76
..
bd78d3f
100644
(file)
--- a/
src/xmlpatterns/functions/qcurrentfn.cpp
+++ b/
src/xmlpatterns/functions/qcurrentfn.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qcurrentfn_p.h
b/src/xmlpatterns/functions/qcurrentfn_p.h
index
2382ec5
..
3572a69
100644
(file)
--- a/
src/xmlpatterns/functions/qcurrentfn_p.h
+++ b/
src/xmlpatterns/functions/qcurrentfn_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qdatetimefn.cpp
b/src/xmlpatterns/functions/qdatetimefn.cpp
index
fa5cb3c
..
13b4324
100644
(file)
--- a/
src/xmlpatterns/functions/qdatetimefn.cpp
+++ b/
src/xmlpatterns/functions/qdatetimefn.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qdatetimefn_p.h
b/src/xmlpatterns/functions/qdatetimefn_p.h
index
ca1799b
..
6616933
100644
(file)
--- a/
src/xmlpatterns/functions/qdatetimefn_p.h
+++ b/
src/xmlpatterns/functions/qdatetimefn_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qdatetimefns_p.h
b/src/xmlpatterns/functions/qdatetimefns_p.h
index
8f23712
..
dcf5339
100644
(file)
--- a/
src/xmlpatterns/functions/qdatetimefns_p.h
+++ b/
src/xmlpatterns/functions/qdatetimefns_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qdatetimefns_tpl_p.h
b/src/xmlpatterns/functions/qdatetimefns_tpl_p.h
index
2108c4d
..
91fa4e3
100644
(file)
--- a/
src/xmlpatterns/functions/qdatetimefns_tpl_p.h
+++ b/
src/xmlpatterns/functions/qdatetimefns_tpl_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qdeepequalfn.cpp
b/src/xmlpatterns/functions/qdeepequalfn.cpp
index
0bf0e92
..
c834013
100644
(file)
--- a/
src/xmlpatterns/functions/qdeepequalfn.cpp
+++ b/
src/xmlpatterns/functions/qdeepequalfn.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qdeepequalfn_p.h
b/src/xmlpatterns/functions/qdeepequalfn_p.h
index
c57337a
..
b4ee4dc
100644
(file)
--- a/
src/xmlpatterns/functions/qdeepequalfn_p.h
+++ b/
src/xmlpatterns/functions/qdeepequalfn_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qdocumentfn.cpp
b/src/xmlpatterns/functions/qdocumentfn.cpp
index
1a43f7b
..
04a5a4f
100644
(file)
--- a/
src/xmlpatterns/functions/qdocumentfn.cpp
+++ b/
src/xmlpatterns/functions/qdocumentfn.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qdocumentfn_p.h
b/src/xmlpatterns/functions/qdocumentfn_p.h
index
24c069c
..
c515f6d
100644
(file)
--- a/
src/xmlpatterns/functions/qdocumentfn_p.h
+++ b/
src/xmlpatterns/functions/qdocumentfn_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qelementavailablefn.cpp
b/src/xmlpatterns/functions/qelementavailablefn.cpp
index
1891ad1
..
d3f8202
100644
(file)
--- a/
src/xmlpatterns/functions/qelementavailablefn.cpp
+++ b/
src/xmlpatterns/functions/qelementavailablefn.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qelementavailablefn_p.h
b/src/xmlpatterns/functions/qelementavailablefn_p.h
index
5b19e4f
..
a15e227
100644
(file)
--- a/
src/xmlpatterns/functions/qelementavailablefn_p.h
+++ b/
src/xmlpatterns/functions/qelementavailablefn_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qerrorfn.cpp
b/src/xmlpatterns/functions/qerrorfn.cpp
index
a231752
..
03f87e8
100644
(file)
--- a/
src/xmlpatterns/functions/qerrorfn.cpp
+++ b/
src/xmlpatterns/functions/qerrorfn.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qerrorfn_p.h
b/src/xmlpatterns/functions/qerrorfn_p.h
index
da581c9
..
d0c3fe7
100644
(file)
--- a/
src/xmlpatterns/functions/qerrorfn_p.h
+++ b/
src/xmlpatterns/functions/qerrorfn_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qfunctionargument.cpp
b/src/xmlpatterns/functions/qfunctionargument.cpp
index
117b8c6
..
7cfb7ca
100644
(file)
--- a/
src/xmlpatterns/functions/qfunctionargument.cpp
+++ b/
src/xmlpatterns/functions/qfunctionargument.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qfunctionargument_p.h
b/src/xmlpatterns/functions/qfunctionargument_p.h
index
fa09fac
..
5390cba
100644
(file)
--- a/
src/xmlpatterns/functions/qfunctionargument_p.h
+++ b/
src/xmlpatterns/functions/qfunctionargument_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qfunctionavailablefn.cpp
b/src/xmlpatterns/functions/qfunctionavailablefn.cpp
index
0dee6dc
..
aea47b1
100644
(file)
--- a/
src/xmlpatterns/functions/qfunctionavailablefn.cpp
+++ b/
src/xmlpatterns/functions/qfunctionavailablefn.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qfunctionavailablefn_p.h
b/src/xmlpatterns/functions/qfunctionavailablefn_p.h
index
09fd004
..
a36fa92
100644
(file)
--- a/
src/xmlpatterns/functions/qfunctionavailablefn_p.h
+++ b/
src/xmlpatterns/functions/qfunctionavailablefn_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qfunctioncall.cpp
b/src/xmlpatterns/functions/qfunctioncall.cpp
index
8b0b91f
..
04755cc
100644
(file)
--- a/
src/xmlpatterns/functions/qfunctioncall.cpp
+++ b/
src/xmlpatterns/functions/qfunctioncall.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qfunctioncall_p.h
b/src/xmlpatterns/functions/qfunctioncall_p.h
index
d98276d
..
a91d91a
100644
(file)
--- a/
src/xmlpatterns/functions/qfunctioncall_p.h
+++ b/
src/xmlpatterns/functions/qfunctioncall_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qfunctionfactory.cpp
b/src/xmlpatterns/functions/qfunctionfactory.cpp
index
264e548
..
bf04b19
100644
(file)
--- a/
src/xmlpatterns/functions/qfunctionfactory.cpp
+++ b/
src/xmlpatterns/functions/qfunctionfactory.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qfunctionfactory_p.h
b/src/xmlpatterns/functions/qfunctionfactory_p.h
index
9338289
..
4507b02
100644
(file)
--- a/
src/xmlpatterns/functions/qfunctionfactory_p.h
+++ b/
src/xmlpatterns/functions/qfunctionfactory_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qfunctionfactorycollection.cpp
b/src/xmlpatterns/functions/qfunctionfactorycollection.cpp
index
5dc9318
..
866a809
100644
(file)
--- a/
src/xmlpatterns/functions/qfunctionfactorycollection.cpp
+++ b/
src/xmlpatterns/functions/qfunctionfactorycollection.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qfunctionfactorycollection_p.h
b/src/xmlpatterns/functions/qfunctionfactorycollection_p.h
index
ac24bc5
..
014af6b
100644
(file)
--- a/
src/xmlpatterns/functions/qfunctionfactorycollection_p.h
+++ b/
src/xmlpatterns/functions/qfunctionfactorycollection_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qfunctionsignature.cpp
b/src/xmlpatterns/functions/qfunctionsignature.cpp
index
2add259
..
29fb858
100644
(file)
--- a/
src/xmlpatterns/functions/qfunctionsignature.cpp
+++ b/
src/xmlpatterns/functions/qfunctionsignature.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qfunctionsignature_p.h
b/src/xmlpatterns/functions/qfunctionsignature_p.h
index
9757d91
..
ee56c28
100644
(file)
--- a/
src/xmlpatterns/functions/qfunctionsignature_p.h
+++ b/
src/xmlpatterns/functions/qfunctionsignature_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qgenerateidfn.cpp
b/src/xmlpatterns/functions/qgenerateidfn.cpp
index
28fa63d
..
72bf8c2
100644
(file)
--- a/
src/xmlpatterns/functions/qgenerateidfn.cpp
+++ b/
src/xmlpatterns/functions/qgenerateidfn.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qgenerateidfn_p.h
b/src/xmlpatterns/functions/qgenerateidfn_p.h
index
e7669a8
..
974bf6a
100644
(file)
--- a/
src/xmlpatterns/functions/qgenerateidfn_p.h
+++ b/
src/xmlpatterns/functions/qgenerateidfn_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qnodefns.cpp
b/src/xmlpatterns/functions/qnodefns.cpp
index
091970e
..
d064c9d
100644
(file)
--- a/
src/xmlpatterns/functions/qnodefns.cpp
+++ b/
src/xmlpatterns/functions/qnodefns.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qnodefns_p.h
b/src/xmlpatterns/functions/qnodefns_p.h
index
284fde4
..
88d3fb8
100644
(file)
--- a/
src/xmlpatterns/functions/qnodefns_p.h
+++ b/
src/xmlpatterns/functions/qnodefns_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qnumericfns.cpp
b/src/xmlpatterns/functions/qnumericfns.cpp
index
fd949f9
..
dc418c7
100644
(file)
--- a/
src/xmlpatterns/functions/qnumericfns.cpp
+++ b/
src/xmlpatterns/functions/qnumericfns.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qnumericfns_p.h
b/src/xmlpatterns/functions/qnumericfns_p.h
index
d623f1e
..
2b86e8b
100644
(file)
--- a/
src/xmlpatterns/functions/qnumericfns_p.h
+++ b/
src/xmlpatterns/functions/qnumericfns_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qpatternmatchingfns.cpp
b/src/xmlpatterns/functions/qpatternmatchingfns.cpp
index
4e5848d
..
48f86ed
100644
(file)
--- a/
src/xmlpatterns/functions/qpatternmatchingfns.cpp
+++ b/
src/xmlpatterns/functions/qpatternmatchingfns.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qpatternmatchingfns_p.h
b/src/xmlpatterns/functions/qpatternmatchingfns_p.h
index
bbdab56
..
0070485
100644
(file)
--- a/
src/xmlpatterns/functions/qpatternmatchingfns_p.h
+++ b/
src/xmlpatterns/functions/qpatternmatchingfns_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qpatternplatform.cpp
b/src/xmlpatterns/functions/qpatternplatform.cpp
index
e9bbfbb
..
0fddcb6
100644
(file)
--- a/
src/xmlpatterns/functions/qpatternplatform.cpp
+++ b/
src/xmlpatterns/functions/qpatternplatform.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qpatternplatform_p.h
b/src/xmlpatterns/functions/qpatternplatform_p.h
index
4a7f087
..
3548111
100644
(file)
--- a/
src/xmlpatterns/functions/qpatternplatform_p.h
+++ b/
src/xmlpatterns/functions/qpatternplatform_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qqnamefns.cpp
b/src/xmlpatterns/functions/qqnamefns.cpp
index
0297c49
..
d17a251
100644
(file)
--- a/
src/xmlpatterns/functions/qqnamefns.cpp
+++ b/
src/xmlpatterns/functions/qqnamefns.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qqnamefns_p.h
b/src/xmlpatterns/functions/qqnamefns_p.h
index
44024dd
..
e965385
100644
(file)
--- a/
src/xmlpatterns/functions/qqnamefns_p.h
+++ b/
src/xmlpatterns/functions/qqnamefns_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qresolveurifn.cpp
b/src/xmlpatterns/functions/qresolveurifn.cpp
index
77bfa79
..
27e5cd0
100644
(file)
--- a/
src/xmlpatterns/functions/qresolveurifn.cpp
+++ b/
src/xmlpatterns/functions/qresolveurifn.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qresolveurifn_p.h
b/src/xmlpatterns/functions/qresolveurifn_p.h
index
3fc9a92
..
331d1bc
100644
(file)
--- a/
src/xmlpatterns/functions/qresolveurifn_p.h
+++ b/
src/xmlpatterns/functions/qresolveurifn_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qsequencefns.cpp
b/src/xmlpatterns/functions/qsequencefns.cpp
index
fe4d227
..
a19b9c5
100644
(file)
--- a/
src/xmlpatterns/functions/qsequencefns.cpp
+++ b/
src/xmlpatterns/functions/qsequencefns.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qsequencefns_p.h
b/src/xmlpatterns/functions/qsequencefns_p.h
index
3b46f78
..
c0382b7
100644
(file)
--- a/
src/xmlpatterns/functions/qsequencefns_p.h
+++ b/
src/xmlpatterns/functions/qsequencefns_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qsequencegeneratingfns.cpp
b/src/xmlpatterns/functions/qsequencegeneratingfns.cpp
index
6a28c4d
..
b5548b7
100644
(file)
--- a/
src/xmlpatterns/functions/qsequencegeneratingfns.cpp
+++ b/
src/xmlpatterns/functions/qsequencegeneratingfns.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qsequencegeneratingfns_p.h
b/src/xmlpatterns/functions/qsequencegeneratingfns_p.h
index
94274bb
..
3bd3394
100644
(file)
--- a/
src/xmlpatterns/functions/qsequencegeneratingfns_p.h
+++ b/
src/xmlpatterns/functions/qsequencegeneratingfns_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h
b/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h
index
6a76bd2
..
d1c8ca7
100644
(file)
--- a/
src/xmlpatterns/functions/qstaticbaseuricontainer_p.h
+++ b/
src/xmlpatterns/functions/qstaticbaseuricontainer_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qstaticnamespacescontainer.cpp
b/src/xmlpatterns/functions/qstaticnamespacescontainer.cpp
index
d4fa874
..
e907f6e
100644
(file)
--- a/
src/xmlpatterns/functions/qstaticnamespacescontainer.cpp
+++ b/
src/xmlpatterns/functions/qstaticnamespacescontainer.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h
b/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h
index
e333253
..
1fda37a
100644
(file)
--- a/
src/xmlpatterns/functions/qstaticnamespacescontainer_p.h
+++ b/
src/xmlpatterns/functions/qstaticnamespacescontainer_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qstringvaluefns.cpp
b/src/xmlpatterns/functions/qstringvaluefns.cpp
index
2343737
..
6e7301a
100644
(file)
--- a/
src/xmlpatterns/functions/qstringvaluefns.cpp
+++ b/
src/xmlpatterns/functions/qstringvaluefns.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qstringvaluefns_p.h
b/src/xmlpatterns/functions/qstringvaluefns_p.h
index
d3d1dfc
..
18218dd
100644
(file)
--- a/
src/xmlpatterns/functions/qstringvaluefns_p.h
+++ b/
src/xmlpatterns/functions/qstringvaluefns_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qsubstringfns.cpp
b/src/xmlpatterns/functions/qsubstringfns.cpp
index
fd83636
..
1c3ae42
100644
(file)
--- a/
src/xmlpatterns/functions/qsubstringfns.cpp
+++ b/
src/xmlpatterns/functions/qsubstringfns.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qsubstringfns_p.h
b/src/xmlpatterns/functions/qsubstringfns_p.h
index
ebd8a64
..
9daae80
100644
(file)
--- a/
src/xmlpatterns/functions/qsubstringfns_p.h
+++ b/
src/xmlpatterns/functions/qsubstringfns_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qsystempropertyfn.cpp
b/src/xmlpatterns/functions/qsystempropertyfn.cpp
index
f777710
..
b81d639
100644
(file)
--- a/
src/xmlpatterns/functions/qsystempropertyfn.cpp
+++ b/
src/xmlpatterns/functions/qsystempropertyfn.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qsystempropertyfn_p.h
b/src/xmlpatterns/functions/qsystempropertyfn_p.h
index
505c48b
..
755a96f
100644
(file)
--- a/
src/xmlpatterns/functions/qsystempropertyfn_p.h
+++ b/
src/xmlpatterns/functions/qsystempropertyfn_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qtimezonefns.cpp
b/src/xmlpatterns/functions/qtimezonefns.cpp
index
73523b8
..
bf9a737
100644
(file)
--- a/
src/xmlpatterns/functions/qtimezonefns.cpp
+++ b/
src/xmlpatterns/functions/qtimezonefns.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qtimezonefns_p.h
b/src/xmlpatterns/functions/qtimezonefns_p.h
index
ad29d53
..
5570baa
100644
(file)
--- a/
src/xmlpatterns/functions/qtimezonefns_p.h
+++ b/
src/xmlpatterns/functions/qtimezonefns_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qtracefn.cpp
b/src/xmlpatterns/functions/qtracefn.cpp
index
8a65feb
..
76e1538
100644
(file)
--- a/
src/xmlpatterns/functions/qtracefn.cpp
+++ b/
src/xmlpatterns/functions/qtracefn.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qtracefn_p.h
b/src/xmlpatterns/functions/qtracefn_p.h
index
974145a
..
198528d
100644
(file)
--- a/
src/xmlpatterns/functions/qtracefn_p.h
+++ b/
src/xmlpatterns/functions/qtracefn_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qtypeavailablefn.cpp
b/src/xmlpatterns/functions/qtypeavailablefn.cpp
index
a289250
..
d2af6a4
100644
(file)
--- a/
src/xmlpatterns/functions/qtypeavailablefn.cpp
+++ b/
src/xmlpatterns/functions/qtypeavailablefn.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qtypeavailablefn_p.h
b/src/xmlpatterns/functions/qtypeavailablefn_p.h
index
c115a8c
..
13a5cee
100644
(file)
--- a/
src/xmlpatterns/functions/qtypeavailablefn_p.h
+++ b/
src/xmlpatterns/functions/qtypeavailablefn_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qunparsedentitypublicidfn.cpp
b/src/xmlpatterns/functions/qunparsedentitypublicidfn.cpp
index
d9c82aa
..
2b31bd4
100644
(file)
--- a/
src/xmlpatterns/functions/qunparsedentitypublicidfn.cpp
+++ b/
src/xmlpatterns/functions/qunparsedentitypublicidfn.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h
b/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h
index
1e2b327
..
ab74211
100644
(file)
--- a/
src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h
+++ b/
src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qunparsedentityurifn.cpp
b/src/xmlpatterns/functions/qunparsedentityurifn.cpp
index
dc0072c
..
6b8dc6e
100644
(file)
--- a/
src/xmlpatterns/functions/qunparsedentityurifn.cpp
+++ b/
src/xmlpatterns/functions/qunparsedentityurifn.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qunparsedentityurifn_p.h
b/src/xmlpatterns/functions/qunparsedentityurifn_p.h
index
f89774d
..
2b6c41a
100644
(file)
--- a/
src/xmlpatterns/functions/qunparsedentityurifn_p.h
+++ b/
src/xmlpatterns/functions/qunparsedentityurifn_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qunparsedtextavailablefn.cpp
b/src/xmlpatterns/functions/qunparsedtextavailablefn.cpp
index
4099e80
..
09137d4
100644
(file)
--- a/
src/xmlpatterns/functions/qunparsedtextavailablefn.cpp
+++ b/
src/xmlpatterns/functions/qunparsedtextavailablefn.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h
b/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h
index
6a18d3e
..
2f6a241
100644
(file)
--- a/
src/xmlpatterns/functions/qunparsedtextavailablefn_p.h
+++ b/
src/xmlpatterns/functions/qunparsedtextavailablefn_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qunparsedtextfn.cpp
b/src/xmlpatterns/functions/qunparsedtextfn.cpp
index
7c3a137
..
33877f8
100644
(file)
--- a/
src/xmlpatterns/functions/qunparsedtextfn.cpp
+++ b/
src/xmlpatterns/functions/qunparsedtextfn.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qunparsedtextfn_p.h
b/src/xmlpatterns/functions/qunparsedtextfn_p.h
index
6718c5a
..
37ae964
100644
(file)
--- a/
src/xmlpatterns/functions/qunparsedtextfn_p.h
+++ b/
src/xmlpatterns/functions/qunparsedtextfn_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qxpath10corefunctions.cpp
b/src/xmlpatterns/functions/qxpath10corefunctions.cpp
index
aa03571
..
0773388
100644
(file)
--- a/
src/xmlpatterns/functions/qxpath10corefunctions.cpp
+++ b/
src/xmlpatterns/functions/qxpath10corefunctions.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qxpath10corefunctions_p.h
b/src/xmlpatterns/functions/qxpath10corefunctions_p.h
index
383a81a
..
0d91068
100644
(file)
--- a/
src/xmlpatterns/functions/qxpath10corefunctions_p.h
+++ b/
src/xmlpatterns/functions/qxpath10corefunctions_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qxpath20corefunctions.cpp
b/src/xmlpatterns/functions/qxpath20corefunctions.cpp
index
68bc62e
..
a476d1e
100644
(file)
--- a/
src/xmlpatterns/functions/qxpath20corefunctions.cpp
+++ b/
src/xmlpatterns/functions/qxpath20corefunctions.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qxpath20corefunctions_p.h
b/src/xmlpatterns/functions/qxpath20corefunctions_p.h
index
a4fcad2
..
d7228ae
100644
(file)
--- a/
src/xmlpatterns/functions/qxpath20corefunctions_p.h
+++ b/
src/xmlpatterns/functions/qxpath20corefunctions_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qxslt20corefunctions.cpp
b/src/xmlpatterns/functions/qxslt20corefunctions.cpp
index
203ff7b
..
54d2190
100644
(file)
--- a/
src/xmlpatterns/functions/qxslt20corefunctions.cpp
+++ b/
src/xmlpatterns/functions/qxslt20corefunctions.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/functions/qxslt20corefunctions_p.h
b/src/xmlpatterns/functions/qxslt20corefunctions_p.h
index
04ec8a4
..
fc390d8
100644
(file)
--- a/
src/xmlpatterns/functions/qxslt20corefunctions_p.h
+++ b/
src/xmlpatterns/functions/qxslt20corefunctions_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/iterators/qcachingiterator.cpp
b/src/xmlpatterns/iterators/qcachingiterator.cpp
index
037c024
..
7e69ecf
100644
(file)
--- a/
src/xmlpatterns/iterators/qcachingiterator.cpp
+++ b/
src/xmlpatterns/iterators/qcachingiterator.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/iterators/qcachingiterator_p.h
b/src/xmlpatterns/iterators/qcachingiterator_p.h
index
86fffd3
..
21c3ee7
100644
(file)
--- a/
src/xmlpatterns/iterators/qcachingiterator_p.h
+++ b/
src/xmlpatterns/iterators/qcachingiterator_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/iterators/qdeduplicateiterator.cpp
b/src/xmlpatterns/iterators/qdeduplicateiterator.cpp
index
2366ca5
..
6a7bd59
100644
(file)
--- a/
src/xmlpatterns/iterators/qdeduplicateiterator.cpp
+++ b/
src/xmlpatterns/iterators/qdeduplicateiterator.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/iterators/qdeduplicateiterator_p.h
b/src/xmlpatterns/iterators/qdeduplicateiterator_p.h
index
94b3574
..
0fc95e1
100644
(file)
--- a/
src/xmlpatterns/iterators/qdeduplicateiterator_p.h
+++ b/
src/xmlpatterns/iterators/qdeduplicateiterator_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/iterators/qdistinctiterator.cpp
b/src/xmlpatterns/iterators/qdistinctiterator.cpp
index
432994b
..
355d558
100644
(file)
--- a/
src/xmlpatterns/iterators/qdistinctiterator.cpp
+++ b/
src/xmlpatterns/iterators/qdistinctiterator.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/iterators/qdistinctiterator_p.h
b/src/xmlpatterns/iterators/qdistinctiterator_p.h
index
baa31d4
..
7e0b3ee
100644
(file)
--- a/
src/xmlpatterns/iterators/qdistinctiterator_p.h
+++ b/
src/xmlpatterns/iterators/qdistinctiterator_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/iterators/qemptyiterator_p.h
b/src/xmlpatterns/iterators/qemptyiterator_p.h
index
d7a59a5
..
8d99282
100644
(file)
--- a/
src/xmlpatterns/iterators/qemptyiterator_p.h
+++ b/
src/xmlpatterns/iterators/qemptyiterator_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/iterators/qexceptiterator.cpp
b/src/xmlpatterns/iterators/qexceptiterator.cpp
index
04efd51
..
4ec95a0
100644
(file)
--- a/
src/xmlpatterns/iterators/qexceptiterator.cpp
+++ b/
src/xmlpatterns/iterators/qexceptiterator.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/iterators/qexceptiterator_p.h
b/src/xmlpatterns/iterators/qexceptiterator_p.h
index
0f04ce1
..
5d6a8ff
100644
(file)
--- a/
src/xmlpatterns/iterators/qexceptiterator_p.h
+++ b/
src/xmlpatterns/iterators/qexceptiterator_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/iterators/qindexofiterator.cpp
b/src/xmlpatterns/iterators/qindexofiterator.cpp
index
0a72c33
..
937541b
100644
(file)
--- a/
src/xmlpatterns/iterators/qindexofiterator.cpp
+++ b/
src/xmlpatterns/iterators/qindexofiterator.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/iterators/qindexofiterator_p.h
b/src/xmlpatterns/iterators/qindexofiterator_p.h
index
b0c7be7
..
88040e3
100644
(file)
--- a/
src/xmlpatterns/iterators/qindexofiterator_p.h
+++ b/
src/xmlpatterns/iterators/qindexofiterator_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/iterators/qinsertioniterator.cpp
b/src/xmlpatterns/iterators/qinsertioniterator.cpp
index
df7a0e0
..
4a2ee92
100644
(file)
--- a/
src/xmlpatterns/iterators/qinsertioniterator.cpp
+++ b/
src/xmlpatterns/iterators/qinsertioniterator.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/iterators/qinsertioniterator_p.h
b/src/xmlpatterns/iterators/qinsertioniterator_p.h
index
6f2d5f1
..
2108452
100644
(file)
--- a/
src/xmlpatterns/iterators/qinsertioniterator_p.h
+++ b/
src/xmlpatterns/iterators/qinsertioniterator_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/iterators/qintersectiterator.cpp
b/src/xmlpatterns/iterators/qintersectiterator.cpp
index
9d3e435
..
87b44e4
100644
(file)
--- a/
src/xmlpatterns/iterators/qintersectiterator.cpp
+++ b/
src/xmlpatterns/iterators/qintersectiterator.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/iterators/qintersectiterator_p.h
b/src/xmlpatterns/iterators/qintersectiterator_p.h
index
1182fa7
..
df80a24
100644
(file)
--- a/
src/xmlpatterns/iterators/qintersectiterator_p.h
+++ b/
src/xmlpatterns/iterators/qintersectiterator_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/iterators/qitemmappingiterator_p.h
b/src/xmlpatterns/iterators/qitemmappingiterator_p.h
index
6fc256d
..
8fba02d
100644
(file)
--- a/
src/xmlpatterns/iterators/qitemmappingiterator_p.h
+++ b/
src/xmlpatterns/iterators/qitemmappingiterator_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/iterators/qrangeiterator.cpp
b/src/xmlpatterns/iterators/qrangeiterator.cpp
index
658e7a8
..
4f2fa17
100644
(file)
--- a/
src/xmlpatterns/iterators/qrangeiterator.cpp
+++ b/
src/xmlpatterns/iterators/qrangeiterator.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/iterators/qrangeiterator_p.h
b/src/xmlpatterns/iterators/qrangeiterator_p.h
index
b963d1f
..
b8bfec6
100644
(file)
--- a/
src/xmlpatterns/iterators/qrangeiterator_p.h
+++ b/
src/xmlpatterns/iterators/qrangeiterator_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/iterators/qremovaliterator.cpp
b/src/xmlpatterns/iterators/qremovaliterator.cpp
index
3fb1f91
..
f4d7716
100644
(file)
--- a/
src/xmlpatterns/iterators/qremovaliterator.cpp
+++ b/
src/xmlpatterns/iterators/qremovaliterator.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/iterators/qremovaliterator_p.h
b/src/xmlpatterns/iterators/qremovaliterator_p.h
index
8e9e069
..
9476928
100644
(file)
--- a/
src/xmlpatterns/iterators/qremovaliterator_p.h
+++ b/
src/xmlpatterns/iterators/qremovaliterator_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/iterators/qsequencemappingiterator_p.h
b/src/xmlpatterns/iterators/qsequencemappingiterator_p.h
index
6855365
..
c4d0d0a
100644
(file)
--- a/
src/xmlpatterns/iterators/qsequencemappingiterator_p.h
+++ b/
src/xmlpatterns/iterators/qsequencemappingiterator_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/iterators/qsingletoniterator_p.h
b/src/xmlpatterns/iterators/qsingletoniterator_p.h
index
446dc67
..
c4ad83d
100644
(file)
--- a/
src/xmlpatterns/iterators/qsingletoniterator_p.h
+++ b/
src/xmlpatterns/iterators/qsingletoniterator_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/iterators/qsubsequenceiterator.cpp
b/src/xmlpatterns/iterators/qsubsequenceiterator.cpp
index
509b519
..
49b1d4c
100644
(file)
--- a/
src/xmlpatterns/iterators/qsubsequenceiterator.cpp
+++ b/
src/xmlpatterns/iterators/qsubsequenceiterator.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/iterators/qsubsequenceiterator_p.h
b/src/xmlpatterns/iterators/qsubsequenceiterator_p.h
index
8958b30
..
43338a0
100644
(file)
--- a/
src/xmlpatterns/iterators/qsubsequenceiterator_p.h
+++ b/
src/xmlpatterns/iterators/qsubsequenceiterator_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/iterators/qtocodepointsiterator.cpp
b/src/xmlpatterns/iterators/qtocodepointsiterator.cpp
index
c78fa03
..
d2fc3f5
100644
(file)
--- a/
src/xmlpatterns/iterators/qtocodepointsiterator.cpp
+++ b/
src/xmlpatterns/iterators/qtocodepointsiterator.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/iterators/qtocodepointsiterator_p.h
b/src/xmlpatterns/iterators/qtocodepointsiterator_p.h
index
1b7a6a9
..
86b9869
100644
(file)
--- a/
src/xmlpatterns/iterators/qtocodepointsiterator_p.h
+++ b/
src/xmlpatterns/iterators/qtocodepointsiterator_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/iterators/qunioniterator.cpp
b/src/xmlpatterns/iterators/qunioniterator.cpp
index
d1698f6
..
a28a946
100644
(file)
--- a/
src/xmlpatterns/iterators/qunioniterator.cpp
+++ b/
src/xmlpatterns/iterators/qunioniterator.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/iterators/qunioniterator_p.h
b/src/xmlpatterns/iterators/qunioniterator_p.h
index
a915b7a
..
a753278
100644
(file)
--- a/
src/xmlpatterns/iterators/qunioniterator_p.h
+++ b/
src/xmlpatterns/iterators/qunioniterator_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/janitors/qargumentconverter.cpp
b/src/xmlpatterns/janitors/qargumentconverter.cpp
index
328a6e8
..
3bab4a0
100644
(file)
--- a/
src/xmlpatterns/janitors/qargumentconverter.cpp
+++ b/
src/xmlpatterns/janitors/qargumentconverter.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/janitors/qargumentconverter_p.h
b/src/xmlpatterns/janitors/qargumentconverter_p.h
index
6372965
..
eafd465
100644
(file)
--- a/
src/xmlpatterns/janitors/qargumentconverter_p.h
+++ b/
src/xmlpatterns/janitors/qargumentconverter_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/janitors/qatomizer.cpp
b/src/xmlpatterns/janitors/qatomizer.cpp
index
fef762d
..
5da7a69
100644
(file)
--- a/
src/xmlpatterns/janitors/qatomizer.cpp
+++ b/
src/xmlpatterns/janitors/qatomizer.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/janitors/qatomizer_p.h
b/src/xmlpatterns/janitors/qatomizer_p.h
index
f755760
..
ea91928
100644
(file)
--- a/
src/xmlpatterns/janitors/qatomizer_p.h
+++ b/
src/xmlpatterns/janitors/qatomizer_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/janitors/qcardinalityverifier.cpp
b/src/xmlpatterns/janitors/qcardinalityverifier.cpp
index
2d532fb
..
3e2cabf
100644
(file)
--- a/
src/xmlpatterns/janitors/qcardinalityverifier.cpp
+++ b/
src/xmlpatterns/janitors/qcardinalityverifier.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/janitors/qcardinalityverifier_p.h
b/src/xmlpatterns/janitors/qcardinalityverifier_p.h
index
c13ed6e
..
c6de02f
100644
(file)
--- a/
src/xmlpatterns/janitors/qcardinalityverifier_p.h
+++ b/
src/xmlpatterns/janitors/qcardinalityverifier_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/janitors/qebvextractor.cpp
b/src/xmlpatterns/janitors/qebvextractor.cpp
index
b19ba22
..
af2dda8
100644
(file)
--- a/
src/xmlpatterns/janitors/qebvextractor.cpp
+++ b/
src/xmlpatterns/janitors/qebvextractor.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/janitors/qebvextractor_p.h
b/src/xmlpatterns/janitors/qebvextractor_p.h
index
a747bb1
..
9e5ec79
100644
(file)
--- a/
src/xmlpatterns/janitors/qebvextractor_p.h
+++ b/
src/xmlpatterns/janitors/qebvextractor_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/janitors/qitemverifier.cpp
b/src/xmlpatterns/janitors/qitemverifier.cpp
index
504d67e
..
fe1d145
100644
(file)
--- a/
src/xmlpatterns/janitors/qitemverifier.cpp
+++ b/
src/xmlpatterns/janitors/qitemverifier.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/janitors/qitemverifier_p.h
b/src/xmlpatterns/janitors/qitemverifier_p.h
index
e275fbf
..
fe433b1
100644
(file)
--- a/
src/xmlpatterns/janitors/qitemverifier_p.h
+++ b/
src/xmlpatterns/janitors/qitemverifier_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/janitors/quntypedatomicconverter.cpp
b/src/xmlpatterns/janitors/quntypedatomicconverter.cpp
index
73d6076
..
dda717f
100644
(file)
--- a/
src/xmlpatterns/janitors/quntypedatomicconverter.cpp
+++ b/
src/xmlpatterns/janitors/quntypedatomicconverter.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/janitors/quntypedatomicconverter_p.h
b/src/xmlpatterns/janitors/quntypedatomicconverter_p.h
index
e89b3fe
..
8f73719
100644
(file)
--- a/
src/xmlpatterns/janitors/quntypedatomicconverter_p.h
+++ b/
src/xmlpatterns/janitors/quntypedatomicconverter_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/parser/TokenLookup.gperf
b/src/xmlpatterns/parser/TokenLookup.gperf
index
ebb7485
..
d434fe3
100644
(file)
--- a/
src/xmlpatterns/parser/TokenLookup.gperf
+++ b/
src/xmlpatterns/parser/TokenLookup.gperf
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/parser/createParser.sh
b/src/xmlpatterns/parser/createParser.sh
index
1474b26
..
d5a8f13
100755
(executable)
--- a/
src/xmlpatterns/parser/createParser.sh
+++ b/
src/xmlpatterns/parser/createParser.sh
@@
-1,39
+1,39
@@
#!/bin/bash
#############################################################################
##
#!/bin/bash
#############################################################################
##
-## Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-## Contact: http://www.qt-project.org/
+## Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+## Contact: http://www.qt-project.org/
legal
##
## This file is the build configuration utility of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL$
##
## This file is the build configuration utility of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Digia. For licensing terms and
+## conditions see http://qt.digia.com/licensing. For further information
+## use the contact form at http://qt.digia.com/contact-us.
+##
## GNU Lesser General Public License Usage
## GNU Lesser General Public License Usage
-##
This file may be used under the terms of the GNU Lesser General Public
-##
License version 2.1 as published by the Free Software Foundation and
-##
appearing in the file LICENSE.LGPL included in the packaging of this
-##
file. Please review the following information to ensure the GNU Lesser
-##
General Public License version 2.1 requirements will be met:
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## In addition, as a special exception,
Nok
ia gives you certain additional
-## rights.
These rights are described in the Nok
ia Qt LGPL Exception
+##
Alternatively, this file may be used under the terms of the GNU Lesser
+##
General Public License version 2.1 as published by the Free Software
+##
Foundation and appearing in the file LICENSE.LGPL included in the
+##
packaging of this file. Please review the following information to
+##
ensure the GNU Lesser General Public License version 2.1 requirements
+##
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception,
Dig
ia gives you certain additional
+## rights.
These rights are described in the Dig
ia Qt LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## GNU General Public License Usage
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU General
-## Public License version 3.0 as published by the Free Software Foundation
-## and appearing in the file LICENSE.GPL included in the packaging of this
-## file. Please review the following information to ensure the GNU General
-## Public License version 3.0 requirements will be met:
-## http://www.gnu.org/copyleft/gpl.html.
-##
-## Other Usage
-## Alternatively, this file may be used in accordance with the terms and
-## conditions contained in a signed written agreement between you and Nokia.
-##
-##
-##
-##
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3.0 as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU General Public License version 3.0 requirements will be
+## met: http://www.gnu.org/copyleft/gpl.html.
##
##
## $QT_END_LICENSE$
##
##
## $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/parser/createTokenLookup.sh
b/src/xmlpatterns/parser/createTokenLookup.sh
index
907ba9b
..
f02c581
100755
(executable)
--- a/
src/xmlpatterns/parser/createTokenLookup.sh
+++ b/
src/xmlpatterns/parser/createTokenLookup.sh
@@
-1,39
+1,39
@@
#!/bin/sh
#############################################################################
##
#!/bin/sh
#############################################################################
##
-## Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-## Contact: http://www.qt-project.org/
+## Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+## Contact: http://www.qt-project.org/
legal
##
## This file is the build configuration utility of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL$
##
## This file is the build configuration utility of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Digia. For licensing terms and
+## conditions see http://qt.digia.com/licensing. For further information
+## use the contact form at http://qt.digia.com/contact-us.
+##
## GNU Lesser General Public License Usage
## GNU Lesser General Public License Usage
-##
This file may be used under the terms of the GNU Lesser General Public
-##
License version 2.1 as published by the Free Software Foundation and
-##
appearing in the file LICENSE.LGPL included in the packaging of this
-##
file. Please review the following information to ensure the GNU Lesser
-##
General Public License version 2.1 requirements will be met:
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
Alternatively, this file may be used under the terms of the GNU Lesser
+##
General Public License version 2.1 as published by the Free Software
+##
Foundation and appearing in the file LICENSE.LGPL included in the
+##
packaging of this file. Please review the following information to
+##
ensure the GNU Lesser General Public License version 2.1 requirements
+##
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
##
-## In addition, as a special exception,
Nok
ia gives you certain additional
-## rights.
These rights are described in the Nok
ia Qt LGPL Exception
+## In addition, as a special exception,
Dig
ia gives you certain additional
+## rights.
These rights are described in the Dig
ia Qt LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## GNU General Public License Usage
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU General
-## Public License version 3.0 as published by the Free Software Foundation
-## and appearing in the file LICENSE.GPL included in the packaging of this
-## file. Please review the following information to ensure the GNU General
-## Public License version 3.0 requirements will be met:
-## http://www.gnu.org/copyleft/gpl.html.
-##
-## Other Usage
-## Alternatively, this file may be used in accordance with the terms and
-## conditions contained in a signed written agreement between you and Nokia.
-##
-##
-##
-##
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3.0 as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU General Public License version 3.0 requirements will be
+## met: http://www.gnu.org/copyleft/gpl.html.
##
##
## $QT_END_LICENSE$
##
##
## $QT_END_LICENSE$
@@
-45,39
+45,39
@@
outFile="qtokenlookup.cpp"
license=`cat <<EOF
/****************************************************************************
**
license=`cat <<EOF
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** \\$QT_BEGIN_LICENSE:LGPL\\$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** \\$QT_BEGIN_LICENSE:LGPL\\$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** \\$QT_END_LICENSE\\$
**
**
** \\$QT_END_LICENSE\\$
diff --git
a/src/xmlpatterns/parser/createXSLTTokenLookup.sh
b/src/xmlpatterns/parser/createXSLTTokenLookup.sh
index
58d6144
..
a8b82fc
100755
(executable)
--- a/
src/xmlpatterns/parser/createXSLTTokenLookup.sh
+++ b/
src/xmlpatterns/parser/createXSLTTokenLookup.sh
@@
-1,39
+1,39
@@
#!/bin/sh
#############################################################################
##
#!/bin/sh
#############################################################################
##
-## Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-## Contact: http://www.qt-project.org/
+## Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+## Contact: http://www.qt-project.org/
legal
##
## This file is the build configuration utility of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL$
##
## This file is the build configuration utility of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Digia. For licensing terms and
+## conditions see http://qt.digia.com/licensing. For further information
+## use the contact form at http://qt.digia.com/contact-us.
+##
## GNU Lesser General Public License Usage
## GNU Lesser General Public License Usage
-##
This file may be used under the terms of the GNU Lesser General Public
-##
License version 2.1 as published by the Free Software Foundation and
-##
appearing in the file LICENSE.LGPL included in the packaging of this
-##
file. Please review the following information to ensure the GNU Lesser
-##
General Public License version 2.1 requirements will be met:
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## In addition, as a special exception,
Nok
ia gives you certain additional
-## rights.
These rights are described in the Nok
ia Qt LGPL Exception
+##
Alternatively, this file may be used under the terms of the GNU Lesser
+##
General Public License version 2.1 as published by the Free Software
+##
Foundation and appearing in the file LICENSE.LGPL included in the
+##
packaging of this file. Please review the following information to
+##
ensure the GNU Lesser General Public License version 2.1 requirements
+##
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception,
Dig
ia gives you certain additional
+## rights.
These rights are described in the Dig
ia Qt LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## GNU General Public License Usage
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU General
-## Public License version 3.0 as published by the Free Software Foundation
-## and appearing in the file LICENSE.GPL included in the packaging of this
-## file. Please review the following information to ensure the GNU General
-## Public License version 3.0 requirements will be met:
-## http://www.gnu.org/copyleft/gpl.html.
-##
-## Other Usage
-## Alternatively, this file may be used in accordance with the terms and
-## conditions contained in a signed written agreement between you and Nokia.
-##
-##
-##
-##
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3.0 as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU General Public License version 3.0 requirements will be
+## met: http://www.gnu.org/copyleft/gpl.html.
##
##
## $QT_END_LICENSE$
##
##
## $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/parser/qmaintainingreader_p.h
b/src/xmlpatterns/parser/qmaintainingreader_p.h
index
a5d3132
..
a4cdf77
100644
(file)
--- a/
src/xmlpatterns/parser/qmaintainingreader_p.h
+++ b/
src/xmlpatterns/parser/qmaintainingreader_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/parser/qmaintainingreader_tpl_p.h
b/src/xmlpatterns/parser/qmaintainingreader_tpl_p.h
index
2222c01
..
a36b74d
100644
(file)
--- a/
src/xmlpatterns/parser/qmaintainingreader_tpl_p.h
+++ b/
src/xmlpatterns/parser/qmaintainingreader_tpl_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/parser/qparsercontext.cpp
b/src/xmlpatterns/parser/qparsercontext.cpp
index
6fb51d5
..
c4e7693
100644
(file)
--- a/
src/xmlpatterns/parser/qparsercontext.cpp
+++ b/
src/xmlpatterns/parser/qparsercontext.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/parser/qparsercontext_p.h
b/src/xmlpatterns/parser/qparsercontext_p.h
index
6e19b8f
..
894063c
100644
(file)
--- a/
src/xmlpatterns/parser/qparsercontext_p.h
+++ b/
src/xmlpatterns/parser/qparsercontext_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/parser/qquerytransformparser.cpp
b/src/xmlpatterns/parser/qquerytransformparser.cpp
index
781b899
..
874b4a6
100644
(file)
--- a/
src/xmlpatterns/parser/qquerytransformparser.cpp
+++ b/
src/xmlpatterns/parser/qquerytransformparser.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/parser/qquerytransformparser_p.h
b/src/xmlpatterns/parser/qquerytransformparser_p.h
index
bf9e39f
..
379f9b9
100644
(file)
--- a/
src/xmlpatterns/parser/qquerytransformparser_p.h
+++ b/
src/xmlpatterns/parser/qquerytransformparser_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/parser/qtokenizer_p.h
b/src/xmlpatterns/parser/qtokenizer_p.h
index
a098ca7
..
c1b405e
100644
(file)
--- a/
src/xmlpatterns/parser/qtokenizer_p.h
+++ b/
src/xmlpatterns/parser/qtokenizer_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/parser/qtokenlookup.cpp
b/src/xmlpatterns/parser/qtokenlookup.cpp
index
7a7f84f
..
8818a9f
100644
(file)
--- a/
src/xmlpatterns/parser/qtokenlookup.cpp
+++ b/
src/xmlpatterns/parser/qtokenlookup.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/parser/qtokenrevealer.cpp
b/src/xmlpatterns/parser/qtokenrevealer.cpp
index
cb55b7b
..
e78c900
100644
(file)
--- a/
src/xmlpatterns/parser/qtokenrevealer.cpp
+++ b/
src/xmlpatterns/parser/qtokenrevealer.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/parser/qtokenrevealer_p.h
b/src/xmlpatterns/parser/qtokenrevealer_p.h
index
6070de0
..
c0ad688
100644
(file)
--- a/
src/xmlpatterns/parser/qtokenrevealer_p.h
+++ b/
src/xmlpatterns/parser/qtokenrevealer_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/parser/qtokensource.cpp
b/src/xmlpatterns/parser/qtokensource.cpp
index
182eabb
..
393c3db
100644
(file)
--- a/
src/xmlpatterns/parser/qtokensource.cpp
+++ b/
src/xmlpatterns/parser/qtokensource.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/parser/qtokensource_p.h
b/src/xmlpatterns/parser/qtokensource_p.h
index
f1decd8
..
475df77
100644
(file)
--- a/
src/xmlpatterns/parser/qtokensource_p.h
+++ b/
src/xmlpatterns/parser/qtokensource_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/parser/querytransformparser.ypp
b/src/xmlpatterns/parser/querytransformparser.ypp
index
d69868e
..
5a16789
100644
(file)
--- a/
src/xmlpatterns/parser/querytransformparser.ypp
+++ b/
src/xmlpatterns/parser/querytransformparser.ypp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
@@
-52,39
+52,39
@@
%{
/****************************************************************************
**
%{
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/parser/qxquerytokenizer.cpp
b/src/xmlpatterns/parser/qxquerytokenizer.cpp
index
0c8960d
..
f19ca91
100644
(file)
--- a/
src/xmlpatterns/parser/qxquerytokenizer.cpp
+++ b/
src/xmlpatterns/parser/qxquerytokenizer.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/parser/qxquerytokenizer_p.h
b/src/xmlpatterns/parser/qxquerytokenizer_p.h
index
3949047
..
7701b80
100644
(file)
--- a/
src/xmlpatterns/parser/qxquerytokenizer_p.h
+++ b/
src/xmlpatterns/parser/qxquerytokenizer_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/parser/qxslttokenizer.cpp
b/src/xmlpatterns/parser/qxslttokenizer.cpp
index
cb3c59e
..
187092d
100644
(file)
--- a/
src/xmlpatterns/parser/qxslttokenizer.cpp
+++ b/
src/xmlpatterns/parser/qxslttokenizer.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/parser/qxslttokenizer_p.h
b/src/xmlpatterns/parser/qxslttokenizer_p.h
index
05404a2
..
5f3433e
100644
(file)
--- a/
src/xmlpatterns/parser/qxslttokenizer_p.h
+++ b/
src/xmlpatterns/parser/qxslttokenizer_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/parser/qxslttokenlookup.cpp
b/src/xmlpatterns/parser/qxslttokenlookup.cpp
index
0ddbfa0
..
d367375
100644
(file)
--- a/
src/xmlpatterns/parser/qxslttokenlookup.cpp
+++ b/
src/xmlpatterns/parser/qxslttokenlookup.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/parser/qxslttokenlookup.xml
b/src/xmlpatterns/parser/qxslttokenlookup.xml
index
67e9c8d
..
6af9290
100644
(file)
--- a/
src/xmlpatterns/parser/qxslttokenlookup.xml
+++ b/
src/xmlpatterns/parser/qxslttokenlookup.xml
@@
-110,39
+110,39
@@
<prolog>/****************************************************************************
**
<prolog>/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/parser/qxslttokenlookup_p.h
b/src/xmlpatterns/parser/qxslttokenlookup_p.h
index
92c8476
..
e304bb3
100644
(file)
--- a/
src/xmlpatterns/parser/qxslttokenlookup_p.h
+++ b/
src/xmlpatterns/parser/qxslttokenlookup_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/parser/trolltechHeader.txt
b/src/xmlpatterns/parser/trolltechHeader.txt
index
d520d02
..
6acc0e8
100644
(file)
--- a/
src/xmlpatterns/parser/trolltechHeader.txt
+++ b/
src/xmlpatterns/parser/trolltechHeader.txt
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/projection/qdocumentprojector.cpp
b/src/xmlpatterns/projection/qdocumentprojector.cpp
index
2f0f5ec
..
390329b
100644
(file)
--- a/
src/xmlpatterns/projection/qdocumentprojector.cpp
+++ b/
src/xmlpatterns/projection/qdocumentprojector.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/projection/qdocumentprojector_p.h
b/src/xmlpatterns/projection/qdocumentprojector_p.h
index
8a3991f
..
b15a699
100644
(file)
--- a/
src/xmlpatterns/projection/qdocumentprojector_p.h
+++ b/
src/xmlpatterns/projection/qdocumentprojector_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/projection/qprojectedexpression_p.h
b/src/xmlpatterns/projection/qprojectedexpression_p.h
index
d5c861f
..
6a320fd
100644
(file)
--- a/
src/xmlpatterns/projection/qprojectedexpression_p.h
+++ b/
src/xmlpatterns/projection/qprojectedexpression_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/qtokenautomaton/exampleFile.xml
b/src/xmlpatterns/qtokenautomaton/exampleFile.xml
index
1e831ab
..
8e0f941
100644
(file)
--- a/
src/xmlpatterns/qtokenautomaton/exampleFile.xml
+++ b/
src/xmlpatterns/qtokenautomaton/exampleFile.xml
@@
-19,39
+19,39
@@
<prolog>/****************************************************************************
**
<prolog>/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qnamespacesupport.cpp
b/src/xmlpatterns/schema/qnamespacesupport.cpp
index
0b99f8b
..
a8a6efc
100644
(file)
--- a/
src/xmlpatterns/schema/qnamespacesupport.cpp
+++ b/
src/xmlpatterns/schema/qnamespacesupport.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qnamespacesupport_p.h
b/src/xmlpatterns/schema/qnamespacesupport_p.h
index
211eea4
..
927d122
100644
(file)
--- a/
src/xmlpatterns/schema/qnamespacesupport_p.h
+++ b/
src/xmlpatterns/schema/qnamespacesupport_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdalternative.cpp
b/src/xmlpatterns/schema/qxsdalternative.cpp
index
1d10f88
..
c8d61a5
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdalternative.cpp
+++ b/
src/xmlpatterns/schema/qxsdalternative.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdalternative_p.h
b/src/xmlpatterns/schema/qxsdalternative_p.h
index
3aa1873
..
6bab546
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdalternative_p.h
+++ b/
src/xmlpatterns/schema/qxsdalternative_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdannotated.cpp
b/src/xmlpatterns/schema/qxsdannotated.cpp
index
0dab4cc
..
ae7446f
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdannotated.cpp
+++ b/
src/xmlpatterns/schema/qxsdannotated.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdannotated_p.h
b/src/xmlpatterns/schema/qxsdannotated_p.h
index
629e2f8
..
2745d81
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdannotated_p.h
+++ b/
src/xmlpatterns/schema/qxsdannotated_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdannotation.cpp
b/src/xmlpatterns/schema/qxsdannotation.cpp
index
4d065e3
..
8031ec7
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdannotation.cpp
+++ b/
src/xmlpatterns/schema/qxsdannotation.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdannotation_p.h
b/src/xmlpatterns/schema/qxsdannotation_p.h
index
821ee9a
..
90d48c0
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdannotation_p.h
+++ b/
src/xmlpatterns/schema/qxsdannotation_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdapplicationinformation.cpp
b/src/xmlpatterns/schema/qxsdapplicationinformation.cpp
index
7d97d31
..
f48c9f6
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdapplicationinformation.cpp
+++ b/
src/xmlpatterns/schema/qxsdapplicationinformation.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdapplicationinformation_p.h
b/src/xmlpatterns/schema/qxsdapplicationinformation_p.h
index
5492236
..
acbadf0
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdapplicationinformation_p.h
+++ b/
src/xmlpatterns/schema/qxsdapplicationinformation_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdassertion.cpp
b/src/xmlpatterns/schema/qxsdassertion.cpp
index
9573546
..
d19766d
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdassertion.cpp
+++ b/
src/xmlpatterns/schema/qxsdassertion.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdassertion_p.h
b/src/xmlpatterns/schema/qxsdassertion_p.h
index
6e0087f
..
86a1c04
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdassertion_p.h
+++ b/
src/xmlpatterns/schema/qxsdassertion_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdattribute.cpp
b/src/xmlpatterns/schema/qxsdattribute.cpp
index
c759c3f
..
829bc05
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdattribute.cpp
+++ b/
src/xmlpatterns/schema/qxsdattribute.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdattribute_p.h
b/src/xmlpatterns/schema/qxsdattribute_p.h
index
bd6b1ad
..
c5f3295
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdattribute_p.h
+++ b/
src/xmlpatterns/schema/qxsdattribute_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdattributegroup.cpp
b/src/xmlpatterns/schema/qxsdattributegroup.cpp
index
a3c0f12
..
a8a4a29
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdattributegroup.cpp
+++ b/
src/xmlpatterns/schema/qxsdattributegroup.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdattributegroup_p.h
b/src/xmlpatterns/schema/qxsdattributegroup_p.h
index
be8cde3
..
ece1759
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdattributegroup_p.h
+++ b/
src/xmlpatterns/schema/qxsdattributegroup_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdattributereference.cpp
b/src/xmlpatterns/schema/qxsdattributereference.cpp
index
f8af974
..
a42220e
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdattributereference.cpp
+++ b/
src/xmlpatterns/schema/qxsdattributereference.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdattributereference_p.h
b/src/xmlpatterns/schema/qxsdattributereference_p.h
index
be9a0a6
..
a87378f
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdattributereference_p.h
+++ b/
src/xmlpatterns/schema/qxsdattributereference_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdattributeterm.cpp
b/src/xmlpatterns/schema/qxsdattributeterm.cpp
index
b0973f2
..
210070a
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdattributeterm.cpp
+++ b/
src/xmlpatterns/schema/qxsdattributeterm.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdattributeterm_p.h
b/src/xmlpatterns/schema/qxsdattributeterm_p.h
index
ed08edb
..
6e0a60f
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdattributeterm_p.h
+++ b/
src/xmlpatterns/schema/qxsdattributeterm_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdattributeuse.cpp
b/src/xmlpatterns/schema/qxsdattributeuse.cpp
index
cf50c33
..
b4fc814
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdattributeuse.cpp
+++ b/
src/xmlpatterns/schema/qxsdattributeuse.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdattributeuse_p.h
b/src/xmlpatterns/schema/qxsdattributeuse_p.h
index
908aca3
..
5472d47
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdattributeuse_p.h
+++ b/
src/xmlpatterns/schema/qxsdattributeuse_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdcomplextype.cpp
b/src/xmlpatterns/schema/qxsdcomplextype.cpp
index
2c3fcd5
..
bf76c71
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdcomplextype.cpp
+++ b/
src/xmlpatterns/schema/qxsdcomplextype.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdcomplextype_p.h
b/src/xmlpatterns/schema/qxsdcomplextype_p.h
index
4f3800c
..
fcbb444
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdcomplextype_p.h
+++ b/
src/xmlpatterns/schema/qxsdcomplextype_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsddocumentation.cpp
b/src/xmlpatterns/schema/qxsddocumentation.cpp
index
832daf7
..
38176ca
100644
(file)
--- a/
src/xmlpatterns/schema/qxsddocumentation.cpp
+++ b/
src/xmlpatterns/schema/qxsddocumentation.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsddocumentation_p.h
b/src/xmlpatterns/schema/qxsddocumentation_p.h
index
ed2a0ae
..
2b39b5d
100644
(file)
--- a/
src/xmlpatterns/schema/qxsddocumentation_p.h
+++ b/
src/xmlpatterns/schema/qxsddocumentation_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdelement.cpp
b/src/xmlpatterns/schema/qxsdelement.cpp
index
f0db625
..
c9a46de
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdelement.cpp
+++ b/
src/xmlpatterns/schema/qxsdelement.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdelement_p.h
b/src/xmlpatterns/schema/qxsdelement_p.h
index
0391387
..
00e4d7f
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdelement_p.h
+++ b/
src/xmlpatterns/schema/qxsdelement_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdfacet.cpp
b/src/xmlpatterns/schema/qxsdfacet.cpp
index
e59bc6b
..
9a25629
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdfacet.cpp
+++ b/
src/xmlpatterns/schema/qxsdfacet.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdfacet_p.h
b/src/xmlpatterns/schema/qxsdfacet_p.h
index
efd465f
..
9b43622
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdfacet_p.h
+++ b/
src/xmlpatterns/schema/qxsdfacet_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdidcache.cpp
b/src/xmlpatterns/schema/qxsdidcache.cpp
index
be58585
..
39357ea
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdidcache.cpp
+++ b/
src/xmlpatterns/schema/qxsdidcache.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdidcache_p.h
b/src/xmlpatterns/schema/qxsdidcache_p.h
index
e330afb
..
e56b46f
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdidcache_p.h
+++ b/
src/xmlpatterns/schema/qxsdidcache_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdidchelper.cpp
b/src/xmlpatterns/schema/qxsdidchelper.cpp
index
f011154
..
8591237
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdidchelper.cpp
+++ b/
src/xmlpatterns/schema/qxsdidchelper.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdidchelper_p.h
b/src/xmlpatterns/schema/qxsdidchelper_p.h
index
b1aa430
..
8c0d075
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdidchelper_p.h
+++ b/
src/xmlpatterns/schema/qxsdidchelper_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdidentityconstraint.cpp
b/src/xmlpatterns/schema/qxsdidentityconstraint.cpp
index
8204fd4
..
572f62e
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdidentityconstraint.cpp
+++ b/
src/xmlpatterns/schema/qxsdidentityconstraint.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdidentityconstraint_p.h
b/src/xmlpatterns/schema/qxsdidentityconstraint_p.h
index
795637d
..
7c7dcfa
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdidentityconstraint_p.h
+++ b/
src/xmlpatterns/schema/qxsdidentityconstraint_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdinstancereader.cpp
b/src/xmlpatterns/schema/qxsdinstancereader.cpp
index
b4fde4b
..
3abdb68
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdinstancereader.cpp
+++ b/
src/xmlpatterns/schema/qxsdinstancereader.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdinstancereader_p.h
b/src/xmlpatterns/schema/qxsdinstancereader_p.h
index
2524198
..
642edbe
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdinstancereader_p.h
+++ b/
src/xmlpatterns/schema/qxsdinstancereader_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdmodelgroup.cpp
b/src/xmlpatterns/schema/qxsdmodelgroup.cpp
index
4ded99d
..
6ff40c3
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdmodelgroup.cpp
+++ b/
src/xmlpatterns/schema/qxsdmodelgroup.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdmodelgroup_p.h
b/src/xmlpatterns/schema/qxsdmodelgroup_p.h
index
1daee64
..
6a46102
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdmodelgroup_p.h
+++ b/
src/xmlpatterns/schema/qxsdmodelgroup_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdnotation.cpp
b/src/xmlpatterns/schema/qxsdnotation.cpp
index
a273105
..
38ca2b8
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdnotation.cpp
+++ b/
src/xmlpatterns/schema/qxsdnotation.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdnotation_p.h
b/src/xmlpatterns/schema/qxsdnotation_p.h
index
6fa9353
..
91ced78
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdnotation_p.h
+++ b/
src/xmlpatterns/schema/qxsdnotation_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdparticle.cpp
b/src/xmlpatterns/schema/qxsdparticle.cpp
index
97a8db5
..
a5a4623
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdparticle.cpp
+++ b/
src/xmlpatterns/schema/qxsdparticle.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdparticle_p.h
b/src/xmlpatterns/schema/qxsdparticle_p.h
index
da64ab6
..
9356df5
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdparticle_p.h
+++ b/
src/xmlpatterns/schema/qxsdparticle_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdparticlechecker.cpp
b/src/xmlpatterns/schema/qxsdparticlechecker.cpp
index
bc8eab3
..
8c9923b
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdparticlechecker.cpp
+++ b/
src/xmlpatterns/schema/qxsdparticlechecker.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdparticlechecker_p.h
b/src/xmlpatterns/schema/qxsdparticlechecker_p.h
index
e2a627b
..
7ba4f0b
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdparticlechecker_p.h
+++ b/
src/xmlpatterns/schema/qxsdparticlechecker_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdreference.cpp
b/src/xmlpatterns/schema/qxsdreference.cpp
index
b645e94
..
6316d15
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdreference.cpp
+++ b/
src/xmlpatterns/schema/qxsdreference.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdreference_p.h
b/src/xmlpatterns/schema/qxsdreference_p.h
index
9446c9d
..
f3a4fe2
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdreference_p.h
+++ b/
src/xmlpatterns/schema/qxsdreference_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdschema.cpp
b/src/xmlpatterns/schema/qxsdschema.cpp
index
351b183
..
a43cec2
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdschema.cpp
+++ b/
src/xmlpatterns/schema/qxsdschema.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdschema_p.h
b/src/xmlpatterns/schema/qxsdschema_p.h
index
166ec96
..
69985cc
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdschema_p.h
+++ b/
src/xmlpatterns/schema/qxsdschema_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdschemachecker.cpp
b/src/xmlpatterns/schema/qxsdschemachecker.cpp
index
33e2679
..
7cee7a8
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdschemachecker.cpp
+++ b/
src/xmlpatterns/schema/qxsdschemachecker.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdschemachecker_helper.cpp
b/src/xmlpatterns/schema/qxsdschemachecker_helper.cpp
index
89d41b4
..
3867b4d
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdschemachecker_helper.cpp
+++ b/
src/xmlpatterns/schema/qxsdschemachecker_helper.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdschemachecker_p.h
b/src/xmlpatterns/schema/qxsdschemachecker_p.h
index
7739094
..
0622f72
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdschemachecker_p.h
+++ b/
src/xmlpatterns/schema/qxsdschemachecker_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdschemachecker_setup.cpp
b/src/xmlpatterns/schema/qxsdschemachecker_setup.cpp
index
b2be38b
..
a31d850
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdschemachecker_setup.cpp
+++ b/
src/xmlpatterns/schema/qxsdschemachecker_setup.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdschemacontext.cpp
b/src/xmlpatterns/schema/qxsdschemacontext.cpp
index
6bbf34c
..
162f143
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdschemacontext.cpp
+++ b/
src/xmlpatterns/schema/qxsdschemacontext.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdschemacontext_p.h
b/src/xmlpatterns/schema/qxsdschemacontext_p.h
index
0d3a3bf
..
7b15646
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdschemacontext_p.h
+++ b/
src/xmlpatterns/schema/qxsdschemacontext_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdschemadebugger.cpp
b/src/xmlpatterns/schema/qxsdschemadebugger.cpp
index
02a5664
..
3b556fd
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdschemadebugger.cpp
+++ b/
src/xmlpatterns/schema/qxsdschemadebugger.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdschemadebugger_p.h
b/src/xmlpatterns/schema/qxsdschemadebugger_p.h
index
c924f72
..
7ae185e
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdschemadebugger_p.h
+++ b/
src/xmlpatterns/schema/qxsdschemadebugger_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdschemahelper.cpp
b/src/xmlpatterns/schema/qxsdschemahelper.cpp
index
fe40283
..
a12da00
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdschemahelper.cpp
+++ b/
src/xmlpatterns/schema/qxsdschemahelper.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdschemahelper_p.h
b/src/xmlpatterns/schema/qxsdschemahelper_p.h
index
0118294
..
5ecd7f3
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdschemahelper_p.h
+++ b/
src/xmlpatterns/schema/qxsdschemahelper_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdschemamerger.cpp
b/src/xmlpatterns/schema/qxsdschemamerger.cpp
index
8736255
..
bb1a80e
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdschemamerger.cpp
+++ b/
src/xmlpatterns/schema/qxsdschemamerger.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdschemamerger_p.h
b/src/xmlpatterns/schema/qxsdschemamerger_p.h
index
671e0d0
..
aef1bf7
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdschemamerger_p.h
+++ b/
src/xmlpatterns/schema/qxsdschemamerger_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdschemaparser.cpp
b/src/xmlpatterns/schema/qxsdschemaparser.cpp
index
292886e
..
183640c
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdschemaparser.cpp
+++ b/
src/xmlpatterns/schema/qxsdschemaparser.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdschemaparser_p.h
b/src/xmlpatterns/schema/qxsdschemaparser_p.h
index
a840faa
..
96c4c27
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdschemaparser_p.h
+++ b/
src/xmlpatterns/schema/qxsdschemaparser_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdschemaparser_setup.cpp
b/src/xmlpatterns/schema/qxsdschemaparser_setup.cpp
index
1b0a7e4
..
517befa
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdschemaparser_setup.cpp
+++ b/
src/xmlpatterns/schema/qxsdschemaparser_setup.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdschemaparsercontext.cpp
b/src/xmlpatterns/schema/qxsdschemaparsercontext.cpp
index
31c046c
..
2e33bd6
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdschemaparsercontext.cpp
+++ b/
src/xmlpatterns/schema/qxsdschemaparsercontext.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdschemaparsercontext_p.h
b/src/xmlpatterns/schema/qxsdschemaparsercontext_p.h
index
c4f6202
..
b508940
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdschemaparsercontext_p.h
+++ b/
src/xmlpatterns/schema/qxsdschemaparsercontext_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdschemaresolver.cpp
b/src/xmlpatterns/schema/qxsdschemaresolver.cpp
index
1daf1b6
..
40b3d7c
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdschemaresolver.cpp
+++ b/
src/xmlpatterns/schema/qxsdschemaresolver.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdschemaresolver_p.h
b/src/xmlpatterns/schema/qxsdschemaresolver_p.h
index
1898640
..
60ac158
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdschemaresolver_p.h
+++ b/
src/xmlpatterns/schema/qxsdschemaresolver_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdschematoken.cpp
b/src/xmlpatterns/schema/qxsdschematoken.cpp
index
62273c6
..
727d8ed
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdschematoken.cpp
+++ b/
src/xmlpatterns/schema/qxsdschematoken.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdschematoken_p.h
b/src/xmlpatterns/schema/qxsdschematoken_p.h
index
40f346c
..
cd2f369
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdschematoken_p.h
+++ b/
src/xmlpatterns/schema/qxsdschematoken_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdschematypesfactory.cpp
b/src/xmlpatterns/schema/qxsdschematypesfactory.cpp
index
5d3d5cd
..
34e4a33
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdschematypesfactory.cpp
+++ b/
src/xmlpatterns/schema/qxsdschematypesfactory.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdschematypesfactory_p.h
b/src/xmlpatterns/schema/qxsdschematypesfactory_p.h
index
6441156
..
3502ee6
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdschematypesfactory_p.h
+++ b/
src/xmlpatterns/schema/qxsdschematypesfactory_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdsimpletype.cpp
b/src/xmlpatterns/schema/qxsdsimpletype.cpp
index
d440cf3
..
7273204
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdsimpletype.cpp
+++ b/
src/xmlpatterns/schema/qxsdsimpletype.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdsimpletype_p.h
b/src/xmlpatterns/schema/qxsdsimpletype_p.h
index
2a33b47
..
d260dbf
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdsimpletype_p.h
+++ b/
src/xmlpatterns/schema/qxsdsimpletype_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdstatemachine_p.h
b/src/xmlpatterns/schema/qxsdstatemachine_p.h
index
72a051e
..
fc73ffd
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdstatemachine_p.h
+++ b/
src/xmlpatterns/schema/qxsdstatemachine_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h
b/src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h
index
0dbf1d2
..
aa6f978
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h
+++ b/
src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdstatemachinebuilder.cpp
b/src/xmlpatterns/schema/qxsdstatemachinebuilder.cpp
index
51409f3
..
5c8cae7
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdstatemachinebuilder.cpp
+++ b/
src/xmlpatterns/schema/qxsdstatemachinebuilder.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h
b/src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h
index
63a998a
..
7085e04
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h
+++ b/
src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdterm.cpp
b/src/xmlpatterns/schema/qxsdterm.cpp
index
f334863
..
86fa682
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdterm.cpp
+++ b/
src/xmlpatterns/schema/qxsdterm.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdterm_p.h
b/src/xmlpatterns/schema/qxsdterm_p.h
index
45276e6
..
1043090
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdterm_p.h
+++ b/
src/xmlpatterns/schema/qxsdterm_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdtypechecker.cpp
b/src/xmlpatterns/schema/qxsdtypechecker.cpp
index
af09816
..
775d3be
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdtypechecker.cpp
+++ b/
src/xmlpatterns/schema/qxsdtypechecker.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdtypechecker_p.h
b/src/xmlpatterns/schema/qxsdtypechecker_p.h
index
d9cc22b
..
b69e7d9
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdtypechecker_p.h
+++ b/
src/xmlpatterns/schema/qxsdtypechecker_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsduserschematype_p.h
b/src/xmlpatterns/schema/qxsduserschematype_p.h
index
b078689
..
9cd1c54
100644
(file)
--- a/
src/xmlpatterns/schema/qxsduserschematype_p.h
+++ b/
src/xmlpatterns/schema/qxsduserschematype_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsduserschematype_tpl_p.h
b/src/xmlpatterns/schema/qxsduserschematype_tpl_p.h
index
841cdb2
..
6a2308a
100644
(file)
--- a/
src/xmlpatterns/schema/qxsduserschematype_tpl_p.h
+++ b/
src/xmlpatterns/schema/qxsduserschematype_tpl_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel.cpp
b/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel.cpp
index
635b854
..
8e77e31
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel.cpp
+++ b/
src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h
b/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h
index
019a605
..
e8ef9b0
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h
+++ b/
src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp
b/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp
index
f765213
..
5f00092
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp
+++ b/
src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h
b/src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h
index
a898a25
..
38a1548
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h
+++ b/
src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdwildcard.cpp
b/src/xmlpatterns/schema/qxsdwildcard.cpp
index
8ee9289
..
7857370
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdwildcard.cpp
+++ b/
src/xmlpatterns/schema/qxsdwildcard.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdwildcard_p.h
b/src/xmlpatterns/schema/qxsdwildcard_p.h
index
6e8e1fb
..
fcb7f56
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdwildcard_p.h
+++ b/
src/xmlpatterns/schema/qxsdwildcard_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdxpathexpression.cpp
b/src/xmlpatterns/schema/qxsdxpathexpression.cpp
index
229c50c
..
f64a4de
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdxpathexpression.cpp
+++ b/
src/xmlpatterns/schema/qxsdxpathexpression.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/qxsdxpathexpression_p.h
b/src/xmlpatterns/schema/qxsdxpathexpression_p.h
index
26818ab
..
3403f0e
100644
(file)
--- a/
src/xmlpatterns/schema/qxsdxpathexpression_p.h
+++ b/
src/xmlpatterns/schema/qxsdxpathexpression_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/schema/tokens.xml
b/src/xmlpatterns/schema/tokens.xml
index
25daabc
..
5851dc4
100644
(file)
--- a/
src/xmlpatterns/schema/tokens.xml
+++ b/
src/xmlpatterns/schema/tokens.xml
@@
-109,39
+109,39
@@
<prolog>/****************************************************************************
**
<prolog>/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qabstractnodetest.cpp
b/src/xmlpatterns/type/qabstractnodetest.cpp
index
237c001
..
960a84b
100644
(file)
--- a/
src/xmlpatterns/type/qabstractnodetest.cpp
+++ b/
src/xmlpatterns/type/qabstractnodetest.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qabstractnodetest_p.h
b/src/xmlpatterns/type/qabstractnodetest_p.h
index
2c8ccad
..
197745f
100644
(file)
--- a/
src/xmlpatterns/type/qabstractnodetest_p.h
+++ b/
src/xmlpatterns/type/qabstractnodetest_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qanyitemtype.cpp
b/src/xmlpatterns/type/qanyitemtype.cpp
index
f518c21
..
edf7510
100644
(file)
--- a/
src/xmlpatterns/type/qanyitemtype.cpp
+++ b/
src/xmlpatterns/type/qanyitemtype.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qanyitemtype_p.h
b/src/xmlpatterns/type/qanyitemtype_p.h
index
5721dfa
..
4d30a10
100644
(file)
--- a/
src/xmlpatterns/type/qanyitemtype_p.h
+++ b/
src/xmlpatterns/type/qanyitemtype_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qanynodetype.cpp
b/src/xmlpatterns/type/qanynodetype.cpp
index
c0e7845
..
5f534ab
100644
(file)
--- a/
src/xmlpatterns/type/qanynodetype.cpp
+++ b/
src/xmlpatterns/type/qanynodetype.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qanynodetype_p.h
b/src/xmlpatterns/type/qanynodetype_p.h
index
b27ce09
..
0c6c1cf
100644
(file)
--- a/
src/xmlpatterns/type/qanynodetype_p.h
+++ b/
src/xmlpatterns/type/qanynodetype_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qanysimpletype.cpp
b/src/xmlpatterns/type/qanysimpletype.cpp
index
2bc4ca0
..
2ff857c
100644
(file)
--- a/
src/xmlpatterns/type/qanysimpletype.cpp
+++ b/
src/xmlpatterns/type/qanysimpletype.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qanysimpletype_p.h
b/src/xmlpatterns/type/qanysimpletype_p.h
index
5df60dc
..
55274e9
100644
(file)
--- a/
src/xmlpatterns/type/qanysimpletype_p.h
+++ b/
src/xmlpatterns/type/qanysimpletype_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qanytype.cpp
b/src/xmlpatterns/type/qanytype.cpp
index
5bfdab3
..
b524b05
100644
(file)
--- a/
src/xmlpatterns/type/qanytype.cpp
+++ b/
src/xmlpatterns/type/qanytype.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qanytype_p.h
b/src/xmlpatterns/type/qanytype_p.h
index
622e40e
..
a0f4a76
100644
(file)
--- a/
src/xmlpatterns/type/qanytype_p.h
+++ b/
src/xmlpatterns/type/qanytype_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qatomiccasterlocator.cpp
b/src/xmlpatterns/type/qatomiccasterlocator.cpp
index
78d0c17
..
9d8f2fd
100644
(file)
--- a/
src/xmlpatterns/type/qatomiccasterlocator.cpp
+++ b/
src/xmlpatterns/type/qatomiccasterlocator.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qatomiccasterlocator_p.h
b/src/xmlpatterns/type/qatomiccasterlocator_p.h
index
8326b9b
..
25227d4
100644
(file)
--- a/
src/xmlpatterns/type/qatomiccasterlocator_p.h
+++ b/
src/xmlpatterns/type/qatomiccasterlocator_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qatomiccasterlocators.cpp
b/src/xmlpatterns/type/qatomiccasterlocators.cpp
index
b44953c
..
847650e
100644
(file)
--- a/
src/xmlpatterns/type/qatomiccasterlocators.cpp
+++ b/
src/xmlpatterns/type/qatomiccasterlocators.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qatomiccasterlocators_p.h
b/src/xmlpatterns/type/qatomiccasterlocators_p.h
index
ef94412
..
25d62f1
100644
(file)
--- a/
src/xmlpatterns/type/qatomiccasterlocators_p.h
+++ b/
src/xmlpatterns/type/qatomiccasterlocators_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qatomiccomparatorlocator.cpp
b/src/xmlpatterns/type/qatomiccomparatorlocator.cpp
index
3e3fc1e
..
05b93a5
100644
(file)
--- a/
src/xmlpatterns/type/qatomiccomparatorlocator.cpp
+++ b/
src/xmlpatterns/type/qatomiccomparatorlocator.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qatomiccomparatorlocator_p.h
b/src/xmlpatterns/type/qatomiccomparatorlocator_p.h
index
ddb5504
..
c8bd52c
100644
(file)
--- a/
src/xmlpatterns/type/qatomiccomparatorlocator_p.h
+++ b/
src/xmlpatterns/type/qatomiccomparatorlocator_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qatomiccomparatorlocators.cpp
b/src/xmlpatterns/type/qatomiccomparatorlocators.cpp
index
97923cd
..
81cdc15
100644
(file)
--- a/
src/xmlpatterns/type/qatomiccomparatorlocators.cpp
+++ b/
src/xmlpatterns/type/qatomiccomparatorlocators.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qatomiccomparatorlocators_p.h
b/src/xmlpatterns/type/qatomiccomparatorlocators_p.h
index
ee6d5e5
..
37fa194
100644
(file)
--- a/
src/xmlpatterns/type/qatomiccomparatorlocators_p.h
+++ b/
src/xmlpatterns/type/qatomiccomparatorlocators_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qatomicmathematicianlocator.cpp
b/src/xmlpatterns/type/qatomicmathematicianlocator.cpp
index
1c08068
..
0589e52
100644
(file)
--- a/
src/xmlpatterns/type/qatomicmathematicianlocator.cpp
+++ b/
src/xmlpatterns/type/qatomicmathematicianlocator.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qatomicmathematicianlocator_p.h
b/src/xmlpatterns/type/qatomicmathematicianlocator_p.h
index
c9a25a4
..
ada89bc
100644
(file)
--- a/
src/xmlpatterns/type/qatomicmathematicianlocator_p.h
+++ b/
src/xmlpatterns/type/qatomicmathematicianlocator_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qatomicmathematicianlocators.cpp
b/src/xmlpatterns/type/qatomicmathematicianlocators.cpp
index
fe9372d
..
59685a4
100644
(file)
--- a/
src/xmlpatterns/type/qatomicmathematicianlocators.cpp
+++ b/
src/xmlpatterns/type/qatomicmathematicianlocators.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qatomicmathematicianlocators_p.h
b/src/xmlpatterns/type/qatomicmathematicianlocators_p.h
index
78f19db
..
9055b2c
100644
(file)
--- a/
src/xmlpatterns/type/qatomicmathematicianlocators_p.h
+++ b/
src/xmlpatterns/type/qatomicmathematicianlocators_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qatomictype.cpp
b/src/xmlpatterns/type/qatomictype.cpp
index
b71f18d
..
5cd6d32
100644
(file)
--- a/
src/xmlpatterns/type/qatomictype.cpp
+++ b/
src/xmlpatterns/type/qatomictype.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qatomictype_p.h
b/src/xmlpatterns/type/qatomictype_p.h
index
b4438bc
..
d71e5e2
100644
(file)
--- a/
src/xmlpatterns/type/qatomictype_p.h
+++ b/
src/xmlpatterns/type/qatomictype_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qatomictypedispatch_p.h
b/src/xmlpatterns/type/qatomictypedispatch_p.h
index
c8f1b90
..
412902b
100644
(file)
--- a/
src/xmlpatterns/type/qatomictypedispatch_p.h
+++ b/
src/xmlpatterns/type/qatomictypedispatch_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qbasictypesfactory.cpp
b/src/xmlpatterns/type/qbasictypesfactory.cpp
index
2d51ba6
..
22fd338
100644
(file)
--- a/
src/xmlpatterns/type/qbasictypesfactory.cpp
+++ b/
src/xmlpatterns/type/qbasictypesfactory.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qbasictypesfactory_p.h
b/src/xmlpatterns/type/qbasictypesfactory_p.h
index
c111266
..
e7fb7cc
100644
(file)
--- a/
src/xmlpatterns/type/qbasictypesfactory_p.h
+++ b/
src/xmlpatterns/type/qbasictypesfactory_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qbuiltinatomictype.cpp
b/src/xmlpatterns/type/qbuiltinatomictype.cpp
index
b338b0d
..
18f0a7b
100644
(file)
--- a/
src/xmlpatterns/type/qbuiltinatomictype.cpp
+++ b/
src/xmlpatterns/type/qbuiltinatomictype.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qbuiltinatomictype_p.h
b/src/xmlpatterns/type/qbuiltinatomictype_p.h
index
038ff47
..
208fcb2
100644
(file)
--- a/
src/xmlpatterns/type/qbuiltinatomictype_p.h
+++ b/
src/xmlpatterns/type/qbuiltinatomictype_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qbuiltinatomictypes.cpp
b/src/xmlpatterns/type/qbuiltinatomictypes.cpp
index
5c482f7
..
6504185
100644
(file)
--- a/
src/xmlpatterns/type/qbuiltinatomictypes.cpp
+++ b/
src/xmlpatterns/type/qbuiltinatomictypes.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qbuiltinatomictypes_p.h
b/src/xmlpatterns/type/qbuiltinatomictypes_p.h
index
32af778
..
f17450f
100644
(file)
--- a/
src/xmlpatterns/type/qbuiltinatomictypes_p.h
+++ b/
src/xmlpatterns/type/qbuiltinatomictypes_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qbuiltinnodetype_p.h
b/src/xmlpatterns/type/qbuiltinnodetype_p.h
index
99157ff
..
9831e87
100644
(file)
--- a/
src/xmlpatterns/type/qbuiltinnodetype_p.h
+++ b/
src/xmlpatterns/type/qbuiltinnodetype_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qbuiltinnodetype_tpl_p.h
b/src/xmlpatterns/type/qbuiltinnodetype_tpl_p.h
index
a3d0162
..
acad671
100644
(file)
--- a/
src/xmlpatterns/type/qbuiltinnodetype_tpl_p.h
+++ b/
src/xmlpatterns/type/qbuiltinnodetype_tpl_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qbuiltintypes.cpp
b/src/xmlpatterns/type/qbuiltintypes.cpp
index
be9c28f
..
f98bbed
100644
(file)
--- a/
src/xmlpatterns/type/qbuiltintypes.cpp
+++ b/
src/xmlpatterns/type/qbuiltintypes.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qbuiltintypes_p.h
b/src/xmlpatterns/type/qbuiltintypes_p.h
index
a58964c
..
62f25de
100644
(file)
--- a/
src/xmlpatterns/type/qbuiltintypes_p.h
+++ b/
src/xmlpatterns/type/qbuiltintypes_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qcardinality.cpp
b/src/xmlpatterns/type/qcardinality.cpp
index
3be1bff
..
1c53a3d
100644
(file)
--- a/
src/xmlpatterns/type/qcardinality.cpp
+++ b/
src/xmlpatterns/type/qcardinality.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qcardinality_p.h
b/src/xmlpatterns/type/qcardinality_p.h
index
b44e021
..
51449fd
100644
(file)
--- a/
src/xmlpatterns/type/qcardinality_p.h
+++ b/
src/xmlpatterns/type/qcardinality_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qcommonsequencetypes.cpp
b/src/xmlpatterns/type/qcommonsequencetypes.cpp
index
8786e1e
..
fe5a47e
100644
(file)
--- a/
src/xmlpatterns/type/qcommonsequencetypes.cpp
+++ b/
src/xmlpatterns/type/qcommonsequencetypes.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qcommonsequencetypes_p.h
b/src/xmlpatterns/type/qcommonsequencetypes_p.h
index
5424a26
..
7361f3d
100644
(file)
--- a/
src/xmlpatterns/type/qcommonsequencetypes_p.h
+++ b/
src/xmlpatterns/type/qcommonsequencetypes_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qebvtype.cpp
b/src/xmlpatterns/type/qebvtype.cpp
index
94d8fc8
..
d42ac21
100644
(file)
--- a/
src/xmlpatterns/type/qebvtype.cpp
+++ b/
src/xmlpatterns/type/qebvtype.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qebvtype_p.h
b/src/xmlpatterns/type/qebvtype_p.h
index
262f61f
..
d5f54cf
100644
(file)
--- a/
src/xmlpatterns/type/qebvtype_p.h
+++ b/
src/xmlpatterns/type/qebvtype_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qemptysequencetype.cpp
b/src/xmlpatterns/type/qemptysequencetype.cpp
index
a283ba0
..
5d1aa6b
100644
(file)
--- a/
src/xmlpatterns/type/qemptysequencetype.cpp
+++ b/
src/xmlpatterns/type/qemptysequencetype.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qemptysequencetype_p.h
b/src/xmlpatterns/type/qemptysequencetype_p.h
index
ddbdb15
..
5406583
100644
(file)
--- a/
src/xmlpatterns/type/qemptysequencetype_p.h
+++ b/
src/xmlpatterns/type/qemptysequencetype_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qgenericsequencetype.cpp
b/src/xmlpatterns/type/qgenericsequencetype.cpp
index
16e8a8e
..
842b98b
100644
(file)
--- a/
src/xmlpatterns/type/qgenericsequencetype.cpp
+++ b/
src/xmlpatterns/type/qgenericsequencetype.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qgenericsequencetype_p.h
b/src/xmlpatterns/type/qgenericsequencetype_p.h
index
4dbf41c
..
155c63f
100644
(file)
--- a/
src/xmlpatterns/type/qgenericsequencetype_p.h
+++ b/
src/xmlpatterns/type/qgenericsequencetype_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qitemtype.cpp
b/src/xmlpatterns/type/qitemtype.cpp
index
b2c3973
..
37aaba1
100644
(file)
--- a/
src/xmlpatterns/type/qitemtype.cpp
+++ b/
src/xmlpatterns/type/qitemtype.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qitemtype_p.h
b/src/xmlpatterns/type/qitemtype_p.h
index
4e851b5
..
d28d19d
100644
(file)
--- a/
src/xmlpatterns/type/qitemtype_p.h
+++ b/
src/xmlpatterns/type/qitemtype_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qlocalnametest.cpp
b/src/xmlpatterns/type/qlocalnametest.cpp
index
4dc182b
..
180ca01
100644
(file)
--- a/
src/xmlpatterns/type/qlocalnametest.cpp
+++ b/
src/xmlpatterns/type/qlocalnametest.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qlocalnametest_p.h
b/src/xmlpatterns/type/qlocalnametest_p.h
index
fc58410
..
dad8913
100644
(file)
--- a/
src/xmlpatterns/type/qlocalnametest_p.h
+++ b/
src/xmlpatterns/type/qlocalnametest_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qmultiitemtype.cpp
b/src/xmlpatterns/type/qmultiitemtype.cpp
index
84b8180
..
0f92203
100644
(file)
--- a/
src/xmlpatterns/type/qmultiitemtype.cpp
+++ b/
src/xmlpatterns/type/qmultiitemtype.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qmultiitemtype_p.h
b/src/xmlpatterns/type/qmultiitemtype_p.h
index
7e9e75f
..
0697064
100644
(file)
--- a/
src/xmlpatterns/type/qmultiitemtype_p.h
+++ b/
src/xmlpatterns/type/qmultiitemtype_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qnamedschemacomponent.cpp
b/src/xmlpatterns/type/qnamedschemacomponent.cpp
index
71a9a84
..
f152103
100644
(file)
--- a/
src/xmlpatterns/type/qnamedschemacomponent.cpp
+++ b/
src/xmlpatterns/type/qnamedschemacomponent.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qnamedschemacomponent_p.h
b/src/xmlpatterns/type/qnamedschemacomponent_p.h
index
77aac0b
..
3f20eaf
100644
(file)
--- a/
src/xmlpatterns/type/qnamedschemacomponent_p.h
+++ b/
src/xmlpatterns/type/qnamedschemacomponent_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qnamespacenametest.cpp
b/src/xmlpatterns/type/qnamespacenametest.cpp
index
0d8b693
..
214a464
100644
(file)
--- a/
src/xmlpatterns/type/qnamespacenametest.cpp
+++ b/
src/xmlpatterns/type/qnamespacenametest.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qnamespacenametest_p.h
b/src/xmlpatterns/type/qnamespacenametest_p.h
index
4c08bec
..
af95f2d
100644
(file)
--- a/
src/xmlpatterns/type/qnamespacenametest_p.h
+++ b/
src/xmlpatterns/type/qnamespacenametest_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qnonetype.cpp
b/src/xmlpatterns/type/qnonetype.cpp
index
fb06bbf
..
3989015
100644
(file)
--- a/
src/xmlpatterns/type/qnonetype.cpp
+++ b/
src/xmlpatterns/type/qnonetype.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qnonetype_p.h
b/src/xmlpatterns/type/qnonetype_p.h
index
32cc396
..
1352fb8
100644
(file)
--- a/
src/xmlpatterns/type/qnonetype_p.h
+++ b/
src/xmlpatterns/type/qnonetype_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qnumerictype.cpp
b/src/xmlpatterns/type/qnumerictype.cpp
index
5ee1661
..
398bb7d
100644
(file)
--- a/
src/xmlpatterns/type/qnumerictype.cpp
+++ b/
src/xmlpatterns/type/qnumerictype.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qnumerictype_p.h
b/src/xmlpatterns/type/qnumerictype_p.h
index
8f41aa5
..
c18fa24
100644
(file)
--- a/
src/xmlpatterns/type/qnumerictype_p.h
+++ b/
src/xmlpatterns/type/qnumerictype_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qprimitives_p.h
b/src/xmlpatterns/type/qprimitives_p.h
index
6e123e3
..
475cd5d
100644
(file)
--- a/
src/xmlpatterns/type/qprimitives_p.h
+++ b/
src/xmlpatterns/type/qprimitives_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qqnametest.cpp
b/src/xmlpatterns/type/qqnametest.cpp
index
a66d07e
..
0c6b0f4
100644
(file)
--- a/
src/xmlpatterns/type/qqnametest.cpp
+++ b/
src/xmlpatterns/type/qqnametest.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qqnametest_p.h
b/src/xmlpatterns/type/qqnametest_p.h
index
1154841
..
3f96b39
100644
(file)
--- a/
src/xmlpatterns/type/qqnametest_p.h
+++ b/
src/xmlpatterns/type/qqnametest_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qschemacomponent.cpp
b/src/xmlpatterns/type/qschemacomponent.cpp
index
c3d8eb7
..
796501f
100644
(file)
--- a/
src/xmlpatterns/type/qschemacomponent.cpp
+++ b/
src/xmlpatterns/type/qschemacomponent.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qschemacomponent_p.h
b/src/xmlpatterns/type/qschemacomponent_p.h
index
4745613
..
a99bc26
100644
(file)
--- a/
src/xmlpatterns/type/qschemacomponent_p.h
+++ b/
src/xmlpatterns/type/qschemacomponent_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qschematype.cpp
b/src/xmlpatterns/type/qschematype.cpp
index
f6d3090
..
e3b8672
100644
(file)
--- a/
src/xmlpatterns/type/qschematype.cpp
+++ b/
src/xmlpatterns/type/qschematype.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qschematype_p.h
b/src/xmlpatterns/type/qschematype_p.h
index
71b868d
..
cf0bf8e
100644
(file)
--- a/
src/xmlpatterns/type/qschematype_p.h
+++ b/
src/xmlpatterns/type/qschematype_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qschematypefactory.cpp
b/src/xmlpatterns/type/qschematypefactory.cpp
index
3b07360
..
2807d05
100644
(file)
--- a/
src/xmlpatterns/type/qschematypefactory.cpp
+++ b/
src/xmlpatterns/type/qschematypefactory.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qschematypefactory_p.h
b/src/xmlpatterns/type/qschematypefactory_p.h
index
bc87d4e
..
bdf0d3f
100644
(file)
--- a/
src/xmlpatterns/type/qschematypefactory_p.h
+++ b/
src/xmlpatterns/type/qschematypefactory_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qsequencetype.cpp
b/src/xmlpatterns/type/qsequencetype.cpp
index
69af566
..
1735496
100644
(file)
--- a/
src/xmlpatterns/type/qsequencetype.cpp
+++ b/
src/xmlpatterns/type/qsequencetype.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qsequencetype_p.h
b/src/xmlpatterns/type/qsequencetype_p.h
index
1bd7ae5
..
8ae8d44
100644
(file)
--- a/
src/xmlpatterns/type/qsequencetype_p.h
+++ b/
src/xmlpatterns/type/qsequencetype_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qtypechecker.cpp
b/src/xmlpatterns/type/qtypechecker.cpp
index
cb63aca
..
9034435
100644
(file)
--- a/
src/xmlpatterns/type/qtypechecker.cpp
+++ b/
src/xmlpatterns/type/qtypechecker.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qtypechecker_p.h
b/src/xmlpatterns/type/qtypechecker_p.h
index
f8a1459
..
085370f
100644
(file)
--- a/
src/xmlpatterns/type/qtypechecker_p.h
+++ b/
src/xmlpatterns/type/qtypechecker_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/quntyped.cpp
b/src/xmlpatterns/type/quntyped.cpp
index
b95db3e
..
4e9b56f
100644
(file)
--- a/
src/xmlpatterns/type/quntyped.cpp
+++ b/
src/xmlpatterns/type/quntyped.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/quntyped_p.h
b/src/xmlpatterns/type/quntyped_p.h
index
53b6038
..
aebdd95
100644
(file)
--- a/
src/xmlpatterns/type/quntyped_p.h
+++ b/
src/xmlpatterns/type/quntyped_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qxsltnodetest.cpp
b/src/xmlpatterns/type/qxsltnodetest.cpp
index
75bc984
..
337be44
100644
(file)
--- a/
src/xmlpatterns/type/qxsltnodetest.cpp
+++ b/
src/xmlpatterns/type/qxsltnodetest.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/type/qxsltnodetest_p.h
b/src/xmlpatterns/type/qxsltnodetest_p.h
index
cfd0921
..
33ac3e3
100644
(file)
--- a/
src/xmlpatterns/type/qxsltnodetest_p.h
+++ b/
src/xmlpatterns/type/qxsltnodetest_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/utils/qautoptr.cpp
b/src/xmlpatterns/utils/qautoptr.cpp
index
afa1e78
..
ecd4b3e
100644
(file)
--- a/
src/xmlpatterns/utils/qautoptr.cpp
+++ b/
src/xmlpatterns/utils/qautoptr.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/utils/qautoptr_p.h
b/src/xmlpatterns/utils/qautoptr_p.h
index
5e9fcbf
..
fb285d6
100644
(file)
--- a/
src/xmlpatterns/utils/qautoptr_p.h
+++ b/
src/xmlpatterns/utils/qautoptr_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/utils/qcommonnamespaces_p.h
b/src/xmlpatterns/utils/qcommonnamespaces_p.h
index
99f7a58
..
b53ad6a
100644
(file)
--- a/
src/xmlpatterns/utils/qcommonnamespaces_p.h
+++ b/
src/xmlpatterns/utils/qcommonnamespaces_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/utils/qcppcastinghelper_p.h
b/src/xmlpatterns/utils/qcppcastinghelper_p.h
index
7fe1118
..
74fae07
100644
(file)
--- a/
src/xmlpatterns/utils/qcppcastinghelper_p.h
+++ b/
src/xmlpatterns/utils/qcppcastinghelper_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/utils/qdebug_p.h
b/src/xmlpatterns/utils/qdebug_p.h
index
0e08080
..
e500843
100644
(file)
--- a/
src/xmlpatterns/utils/qdebug_p.h
+++ b/
src/xmlpatterns/utils/qdebug_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/utils/qdelegatingnamespaceresolver.cpp
b/src/xmlpatterns/utils/qdelegatingnamespaceresolver.cpp
index
fecf355
..
589e123
100644
(file)
--- a/
src/xmlpatterns/utils/qdelegatingnamespaceresolver.cpp
+++ b/
src/xmlpatterns/utils/qdelegatingnamespaceresolver.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h
b/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h
index
b3a96ad
..
bb07a6b
100644
(file)
--- a/
src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h
+++ b/
src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/utils/qgenericnamespaceresolver.cpp
b/src/xmlpatterns/utils/qgenericnamespaceresolver.cpp
index
09a48cd
..
51e5272
100644
(file)
--- a/
src/xmlpatterns/utils/qgenericnamespaceresolver.cpp
+++ b/
src/xmlpatterns/utils/qgenericnamespaceresolver.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h
b/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h
index
8e749e5
..
d65cbb1
100644
(file)
--- a/
src/xmlpatterns/utils/qgenericnamespaceresolver_p.h
+++ b/
src/xmlpatterns/utils/qgenericnamespaceresolver_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/utils/qnamepool.cpp
b/src/xmlpatterns/utils/qnamepool.cpp
index
b3be55a
..
1df8a62
100644
(file)
--- a/
src/xmlpatterns/utils/qnamepool.cpp
+++ b/
src/xmlpatterns/utils/qnamepool.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/utils/qnamepool_p.h
b/src/xmlpatterns/utils/qnamepool_p.h
index
dc8fd83
..
6d1394f
100644
(file)
--- a/
src/xmlpatterns/utils/qnamepool_p.h
+++ b/
src/xmlpatterns/utils/qnamepool_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/utils/qnamespacebinding_p.h
b/src/xmlpatterns/utils/qnamespacebinding_p.h
index
373f840
..
2753de2
100644
(file)
--- a/
src/xmlpatterns/utils/qnamespacebinding_p.h
+++ b/
src/xmlpatterns/utils/qnamespacebinding_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/utils/qnamespaceresolver.cpp
b/src/xmlpatterns/utils/qnamespaceresolver.cpp
index
da1f2aa
..
a36fcff
100644
(file)
--- a/
src/xmlpatterns/utils/qnamespaceresolver.cpp
+++ b/
src/xmlpatterns/utils/qnamespaceresolver.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/utils/qnamespaceresolver_p.h
b/src/xmlpatterns/utils/qnamespaceresolver_p.h
index
50e5fb1
..
e7592ec
100644
(file)
--- a/
src/xmlpatterns/utils/qnamespaceresolver_p.h
+++ b/
src/xmlpatterns/utils/qnamespaceresolver_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/utils/qnodenamespaceresolver.cpp
b/src/xmlpatterns/utils/qnodenamespaceresolver.cpp
index
60276ad
..
860f80c
100644
(file)
--- a/
src/xmlpatterns/utils/qnodenamespaceresolver.cpp
+++ b/
src/xmlpatterns/utils/qnodenamespaceresolver.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/utils/qnodenamespaceresolver_p.h
b/src/xmlpatterns/utils/qnodenamespaceresolver_p.h
index
9a22343
..
b996032
100644
(file)
--- a/
src/xmlpatterns/utils/qnodenamespaceresolver_p.h
+++ b/
src/xmlpatterns/utils/qnodenamespaceresolver_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/utils/qoutputvalidator.cpp
b/src/xmlpatterns/utils/qoutputvalidator.cpp
index
ce63bfe
..
bf323ca
100644
(file)
--- a/
src/xmlpatterns/utils/qoutputvalidator.cpp
+++ b/
src/xmlpatterns/utils/qoutputvalidator.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/utils/qoutputvalidator_p.h
b/src/xmlpatterns/utils/qoutputvalidator_p.h
index
1c56c22
..
d0d36ac
100644
(file)
--- a/
src/xmlpatterns/utils/qoutputvalidator_p.h
+++ b/
src/xmlpatterns/utils/qoutputvalidator_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/utils/qpatternistlocale.cpp
b/src/xmlpatterns/utils/qpatternistlocale.cpp
index
abf98d7
..
83223da
100644
(file)
--- a/
src/xmlpatterns/utils/qpatternistlocale.cpp
+++ b/
src/xmlpatterns/utils/qpatternistlocale.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/utils/qpatternistlocale_p.h
b/src/xmlpatterns/utils/qpatternistlocale_p.h
index
aecdb92
..
bf175b4
100644
(file)
--- a/
src/xmlpatterns/utils/qpatternistlocale_p.h
+++ b/
src/xmlpatterns/utils/qpatternistlocale_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/utils/qxpathhelper.cpp
b/src/xmlpatterns/utils/qxpathhelper.cpp
index
4065c4d
..
9b37f19
100644
(file)
--- a/
src/xmlpatterns/utils/qxpathhelper.cpp
+++ b/
src/xmlpatterns/utils/qxpathhelper.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/src/xmlpatterns/utils/qxpathhelper_p.h
b/src/xmlpatterns/utils/qxpathhelper_p.h
index
d153eb2
..
d359735
100644
(file)
--- a/
src/xmlpatterns/utils/qxpathhelper_p.h
+++ b/
src/xmlpatterns/utils/qxpathhelper_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/checkxmlfiles/tst_checkxmlfiles.cpp
b/tests/auto/checkxmlfiles/tst_checkxmlfiles.cpp
index
1d9a088
..
8baa776
100644
(file)
--- a/
tests/auto/checkxmlfiles/tst_checkxmlfiles.cpp
+++ b/
tests/auto/checkxmlfiles/tst_checkxmlfiles.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/cmake/test_modules/main.cpp
b/tests/auto/cmake/test_modules/main.cpp
index
20f5ae2
..
64e9851
100644
(file)
--- a/
tests/auto/cmake/test_modules/main.cpp
+++ b/
tests/auto/cmake/test_modules/main.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
** Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly <stephen.kelly@kdab.com>
/****************************************************************************
**
** Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly <stephen.kelly@kdab.com>
-** Contact: http://www.qt-project.org/
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/compilerwarnings/data/test_cpp.txt
b/tests/auto/compilerwarnings/data/test_cpp.txt
index
c1cc82b
..
8d9ef2f
100644
(file)
--- a/
tests/auto/compilerwarnings/data/test_cpp.txt
+++ b/
tests/auto/compilerwarnings/data/test_cpp.txt
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/headersclean/tst_headersclean.cpp
b/tests/auto/headersclean/tst_headersclean.cpp
index
8ee9545
..
684f5fc
100644
(file)
--- a/
tests/auto/headersclean/tst_headersclean.cpp
+++ b/
tests/auto/headersclean/tst_headersclean.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/network-settings.h
b/tests/auto/network-settings.h
index
179eea9
..
650e34a
100644
(file)
--- a/
tests/auto/network-settings.h
+++ b/
tests/auto/network-settings.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/patternistexamplefiletree/tst_patternistexamplefiletree.cpp
b/tests/auto/patternistexamplefiletree/tst_patternistexamplefiletree.cpp
index
58bc502
..
a489ca2
100644
(file)
--- a/
tests/auto/patternistexamplefiletree/tst_patternistexamplefiletree.cpp
+++ b/
tests/auto/patternistexamplefiletree/tst_patternistexamplefiletree.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/patternistexamples/tst_patternistexamples.cpp
b/tests/auto/patternistexamples/tst_patternistexamples.cpp
index
8d0c46d
..
f3ef905
100644
(file)
--- a/
tests/auto/patternistexamples/tst_patternistexamples.cpp
+++ b/
tests/auto/patternistexamples/tst_patternistexamples.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/patternistheaders/tst_patternistheaders.cpp
b/tests/auto/patternistheaders/tst_patternistheaders.cpp
index
5305d2c
..
fb8d1dc
100644
(file)
--- a/
tests/auto/patternistheaders/tst_patternistheaders.cpp
+++ b/
tests/auto/patternistheaders/tst_patternistheaders.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qabstractmessagehandler/tst_qabstractmessagehandler.cpp
b/tests/auto/qabstractmessagehandler/tst_qabstractmessagehandler.cpp
index
e5aee04
..
d957312
100644
(file)
--- a/
tests/auto/qabstractmessagehandler/tst_qabstractmessagehandler.cpp
+++ b/
tests/auto/qabstractmessagehandler/tst_qabstractmessagehandler.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qabstracturiresolver/TestURIResolver.h
b/tests/auto/qabstracturiresolver/TestURIResolver.h
index
4f69f5e
..
120d962
100644
(file)
--- a/
tests/auto/qabstracturiresolver/TestURIResolver.h
+++ b/
tests/auto/qabstracturiresolver/TestURIResolver.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qabstracturiresolver/tst_qabstracturiresolver.cpp
b/tests/auto/qabstracturiresolver/tst_qabstracturiresolver.cpp
index
d5572ae
..
66f1f6c
100644
(file)
--- a/
tests/auto/qabstracturiresolver/tst_qabstracturiresolver.cpp
+++ b/
tests/auto/qabstracturiresolver/tst_qabstracturiresolver.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qabstractxmlforwarditerator/tst_qabstractxmlforwarditerator.cpp
b/tests/auto/qabstractxmlforwarditerator/tst_qabstractxmlforwarditerator.cpp
index
1cdbc2d
..
0f72166
100644
(file)
--- a/
tests/auto/qabstractxmlforwarditerator/tst_qabstractxmlforwarditerator.cpp
+++ b/
tests/auto/qabstractxmlforwarditerator/tst_qabstractxmlforwarditerator.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp
b/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp
index
9c9fd23
..
92916d5
100644
(file)
--- a/
tests/auto/qabstractxmlnodemodel/LoadingModel.cpp
+++ b/
tests/auto/qabstractxmlnodemodel/LoadingModel.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qabstractxmlnodemodel/LoadingModel.h
b/tests/auto/qabstractxmlnodemodel/LoadingModel.h
index
f5b63e9
..
506924b
100644
(file)
--- a/
tests/auto/qabstractxmlnodemodel/LoadingModel.h
+++ b/
tests/auto/qabstractxmlnodemodel/LoadingModel.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qabstractxmlnodemodel/TestNodeModel.h
b/tests/auto/qabstractxmlnodemodel/TestNodeModel.h
index
5064ab7
..
503d44f
100644
(file)
--- a/
tests/auto/qabstractxmlnodemodel/TestNodeModel.h
+++ b/
tests/auto/qabstractxmlnodemodel/TestNodeModel.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp
b/tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp
index
3d2369d
..
e57a81a
100644
(file)
--- a/
tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp
+++ b/
tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qabstractxmlreceiver/TestAbstractXmlReceiver.h
b/tests/auto/qabstractxmlreceiver/TestAbstractXmlReceiver.h
index
eebfc4c
..
d5cda7f
100644
(file)
--- a/
tests/auto/qabstractxmlreceiver/TestAbstractXmlReceiver.h
+++ b/
tests/auto/qabstractxmlreceiver/TestAbstractXmlReceiver.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qabstractxmlreceiver/tst_qabstractxmlreceiver.cpp
b/tests/auto/qabstractxmlreceiver/tst_qabstractxmlreceiver.cpp
index
7e0630b
..
416be63
100644
(file)
--- a/
tests/auto/qabstractxmlreceiver/tst_qabstractxmlreceiver.cpp
+++ b/
tests/auto/qabstractxmlreceiver/tst_qabstractxmlreceiver.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qapplicationargumentparser/tst_qapplicationargumentparser.cpp
b/tests/auto/qapplicationargumentparser/tst_qapplicationargumentparser.cpp
index
d9aa5b1
..
6dea47a
100644
(file)
--- a/
tests/auto/qapplicationargumentparser/tst_qapplicationargumentparser.cpp
+++ b/
tests/auto/qapplicationargumentparser/tst_qapplicationargumentparser.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qautoptr/tst_qautoptr.cpp
b/tests/auto/qautoptr/tst_qautoptr.cpp
index
ac596d6
..
8b415a6
100644
(file)
--- a/
tests/auto/qautoptr/tst_qautoptr.cpp
+++ b/
tests/auto/qautoptr/tst_qautoptr.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qsimplexmlnodemodel/TestSimpleNodeModel.h
b/tests/auto/qsimplexmlnodemodel/TestSimpleNodeModel.h
index
8d525a4
..
c127f9b
100644
(file)
--- a/
tests/auto/qsimplexmlnodemodel/TestSimpleNodeModel.h
+++ b/
tests/auto/qsimplexmlnodemodel/TestSimpleNodeModel.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp
b/tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp
index
4b9ce72
..
63b15b1
100644
(file)
--- a/
tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp
+++ b/
tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qsourcelocation/tst_qsourcelocation.cpp
b/tests/auto/qsourcelocation/tst_qsourcelocation.cpp
index
c52a763
..
22b9214
100644
(file)
--- a/
tests/auto/qsourcelocation/tst_qsourcelocation.cpp
+++ b/
tests/auto/qsourcelocation/tst_qsourcelocation.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qxmlformatter/tst_qxmlformatter.cpp
b/tests/auto/qxmlformatter/tst_qxmlformatter.cpp
index
9ec0e4e
..
56dc9e7
100644
(file)
--- a/
tests/auto/qxmlformatter/tst_qxmlformatter.cpp
+++ b/
tests/auto/qxmlformatter/tst_qxmlformatter.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qxmlitem/tst_qxmlitem.cpp
b/tests/auto/qxmlitem/tst_qxmlitem.cpp
index
09d1923
..
f97a503
100644
(file)
--- a/
tests/auto/qxmlitem/tst_qxmlitem.cpp
+++ b/
tests/auto/qxmlitem/tst_qxmlitem.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qxmlname/tst_qxmlname.cpp
b/tests/auto/qxmlname/tst_qxmlname.cpp
index
832ca76
..
afbbc92
100644
(file)
--- a/
tests/auto/qxmlname/tst_qxmlname.cpp
+++ b/
tests/auto/qxmlname/tst_qxmlname.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qxmlnamepool/tst_qxmlnamepool.cpp
b/tests/auto/qxmlnamepool/tst_qxmlnamepool.cpp
index
f1b1812
..
56a94ff
100644
(file)
--- a/
tests/auto/qxmlnamepool/tst_qxmlnamepool.cpp
+++ b/
tests/auto/qxmlnamepool/tst_qxmlnamepool.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp
b/tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp
index
3a09ce9
..
9458706
100644
(file)
--- a/
tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp
+++ b/
tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qxmlquery/MessageSilencer.h
b/tests/auto/qxmlquery/MessageSilencer.h
index
f75be33
..
fc9b7da
100644
(file)
--- a/
tests/auto/qxmlquery/MessageSilencer.h
+++ b/
tests/auto/qxmlquery/MessageSilencer.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qxmlquery/MessageValidator.cpp
b/tests/auto/qxmlquery/MessageValidator.cpp
index
7fd8fa2
..
572aaa6
100644
(file)
--- a/
tests/auto/qxmlquery/MessageValidator.cpp
+++ b/
tests/auto/qxmlquery/MessageValidator.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qxmlquery/MessageValidator.h
b/tests/auto/qxmlquery/MessageValidator.h
index
659c0e8
..
006ac02
100644
(file)
--- a/
tests/auto/qxmlquery/MessageValidator.h
+++ b/
tests/auto/qxmlquery/MessageValidator.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qxmlquery/NetworkOverrider.h
b/tests/auto/qxmlquery/NetworkOverrider.h
index
1a59024
..
e287d98
100644
(file)
--- a/
tests/auto/qxmlquery/NetworkOverrider.h
+++ b/
tests/auto/qxmlquery/NetworkOverrider.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qxmlquery/PushBaseliner.h
b/tests/auto/qxmlquery/PushBaseliner.h
index
07aa7d5
..
f76b418
100644
(file)
--- a/
tests/auto/qxmlquery/PushBaseliner.h
+++ b/
tests/auto/qxmlquery/PushBaseliner.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qxmlquery/TestFundament.cpp
b/tests/auto/qxmlquery/TestFundament.cpp
index
b5adb05
..
ea6edc6
100644
(file)
--- a/
tests/auto/qxmlquery/TestFundament.cpp
+++ b/
tests/auto/qxmlquery/TestFundament.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qxmlquery/TestFundament.h
b/tests/auto/qxmlquery/TestFundament.h
index
da0b588
..
4eba5cc
100644
(file)
--- a/
tests/auto/qxmlquery/TestFundament.h
+++ b/
tests/auto/qxmlquery/TestFundament.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qxmlquery/tst_qxmlquery.cpp
b/tests/auto/qxmlquery/tst_qxmlquery.cpp
index
c8d9110
..
1bd1b52
100644
(file)
--- a/
tests/auto/qxmlquery/tst_qxmlquery.cpp
+++ b/
tests/auto/qxmlquery/tst_qxmlquery.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qxmlresultitems/tst_qxmlresultitems.cpp
b/tests/auto/qxmlresultitems/tst_qxmlresultitems.cpp
index
b170932
..
e5110ce
100644
(file)
--- a/
tests/auto/qxmlresultitems/tst_qxmlresultitems.cpp
+++ b/
tests/auto/qxmlresultitems/tst_qxmlresultitems.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qxmlschema/tst_qxmlschema.cpp
b/tests/auto/qxmlschema/tst_qxmlschema.cpp
index
3006c7d
..
4c95205
100644
(file)
--- a/
tests/auto/qxmlschema/tst_qxmlschema.cpp
+++ b/
tests/auto/qxmlschema/tst_qxmlschema.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qxmlschemavalidator/tst_qxmlschemavalidator.cpp
b/tests/auto/qxmlschemavalidator/tst_qxmlschemavalidator.cpp
index
d458049
..
1bf2c0e
100644
(file)
--- a/
tests/auto/qxmlschemavalidator/tst_qxmlschemavalidator.cpp
+++ b/
tests/auto/qxmlschemavalidator/tst_qxmlschemavalidator.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/qxmlserializer/tst_qxmlserializer.cpp
b/tests/auto/qxmlserializer/tst_qxmlserializer.cpp
index
7cdbfc5
..
c0a1d42
100644
(file)
--- a/
tests/auto/qxmlserializer/tst_qxmlserializer.cpp
+++ b/
tests/auto/qxmlserializer/tst_qxmlserializer.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp
b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp
index
e723d1d
..
d7aca0a
100644
(file)
--- a/
tests/auto/xmlpatterns/tst_xmlpatterns.cpp
+++ b/
tests/auto/xmlpatterns/tst_xmlpatterns.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternsdiagnosticsts/TestSuite/validate.sh
b/tests/auto/xmlpatternsdiagnosticsts/TestSuite/validate.sh
index
1c94807
..
c101995
100755
(executable)
--- a/
tests/auto/xmlpatternsdiagnosticsts/TestSuite/validate.sh
+++ b/
tests/auto/xmlpatternsdiagnosticsts/TestSuite/validate.sh
@@
-1,39
+1,39
@@
#!/usr/bin/env bash
#############################################################################
##
#!/usr/bin/env bash
#############################################################################
##
-## Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-## Contact: http://www.qt-project.org/
+## Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+## Contact: http://www.qt-project.org/
legal
##
## This file is the build configuration utility of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL$
##
## This file is the build configuration utility of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Digia. For licensing terms and
+## conditions see http://qt.digia.com/licensing. For further information
+## use the contact form at http://qt.digia.com/contact-us.
+##
## GNU Lesser General Public License Usage
## GNU Lesser General Public License Usage
-##
This file may be used under the terms of the GNU Lesser General Public
-##
License version 2.1 as published by the Free Software Foundation and
-##
appearing in the file LICENSE.LGPL included in the packaging of this
-##
file. Please review the following information to ensure the GNU Lesser
-##
General Public License version 2.1 requirements will be met:
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## In addition, as a special exception,
Nok
ia gives you certain additional
-## rights.
These rights are described in the Nok
ia Qt LGPL Exception
+##
Alternatively, this file may be used under the terms of the GNU Lesser
+##
General Public License version 2.1 as published by the Free Software
+##
Foundation and appearing in the file LICENSE.LGPL included in the
+##
packaging of this file. Please review the following information to
+##
ensure the GNU Lesser General Public License version 2.1 requirements
+##
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception,
Dig
ia gives you certain additional
+## rights.
These rights are described in the Dig
ia Qt LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## GNU General Public License Usage
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU General
-## Public License version 3.0 as published by the Free Software Foundation
-## and appearing in the file LICENSE.GPL included in the packaging of this
-## file. Please review the following information to ensure the GNU General
-## Public License version 3.0 requirements will be met:
-## http://www.gnu.org/copyleft/gpl.html.
-##
-## Other Usage
-## Alternatively, this file may be used in accordance with the terms and
-## conditions contained in a signed written agreement between you and Nokia.
-##
-##
-##
-##
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3.0 as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU General Public License version 3.0 requirements will be
+## met: http://www.gnu.org/copyleft/gpl.html.
##
##
## $QT_END_LICENSE$
##
##
## $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp
b/tests/auto/xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp
index
149ca01
..
70a1cf8
100644
(file)
--- a/
tests/auto/xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp
+++ b/
tests/auto/xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternsschema/tst_xmlpatternsschema.cpp
b/tests/auto/xmlpatternsschema/tst_xmlpatternsschema.cpp
index
49d0b8d
..
04644a5
100644
(file)
--- a/
tests/auto/xmlpatternsschema/tst_xmlpatternsschema.cpp
+++ b/
tests/auto/xmlpatternsschema/tst_xmlpatternsschema.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternsschemats/TESTSUITE/updateSuite.sh
b/tests/auto/xmlpatternsschemats/TESTSUITE/updateSuite.sh
index
1a81259
..
af490a7
100755
(executable)
--- a/
tests/auto/xmlpatternsschemats/TESTSUITE/updateSuite.sh
+++ b/
tests/auto/xmlpatternsschemats/TESTSUITE/updateSuite.sh
@@
-1,39
+1,39
@@
#!/bin/bash
#############################################################################
##
#!/bin/bash
#############################################################################
##
-## Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-## Contact: http://www.qt-project.org/
+## Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+## Contact: http://www.qt-project.org/
legal
##
## This file is part of the test suite of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL$
##
## This file is part of the test suite of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Digia. For licensing terms and
+## conditions see http://qt.digia.com/licensing. For further information
+## use the contact form at http://qt.digia.com/contact-us.
+##
## GNU Lesser General Public License Usage
## GNU Lesser General Public License Usage
-##
This file may be used under the terms of the GNU Lesser General Public
-##
License version 2.1 as published by the Free Software Foundation and
-##
appearing in the file LICENSE.LGPL included in the packaging of this
-##
file. Please review the following information to ensure the GNU Lesser
-##
General Public License version 2.1 requirements will be met:
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
Alternatively, this file may be used under the terms of the GNU Lesser
+##
General Public License version 2.1 as published by the Free Software
+##
Foundation and appearing in the file LICENSE.LGPL included in the
+##
packaging of this file. Please review the following information to
+##
ensure the GNU Lesser General Public License version 2.1 requirements
+##
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
##
-## In addition, as a special exception,
Nok
ia gives you certain additional
-## rights.
These rights are described in the Nok
ia Qt LGPL Exception
+## In addition, as a special exception,
Dig
ia gives you certain additional
+## rights.
These rights are described in the Dig
ia Qt LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## GNU General Public License Usage
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU General
-## Public License version 3.0 as published by the Free Software Foundation
-## and appearing in the file LICENSE.GPL included in the packaging of this
-## file. Please review the following information to ensure the GNU General
-## Public License version 3.0 requirements will be met:
-## http://www.gnu.org/copyleft/gpl.html.
-##
-## Other Usage
-## Alternatively, this file may be used in accordance with the terms and
-## conditions contained in a signed written agreement between you and Nokia.
-##
-##
-##
-##
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3.0 as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU General Public License version 3.0 requirements will be
+## met: http://www.gnu.org/copyleft/gpl.html.
##
##
## $QT_END_LICENSE$
##
##
## $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternsschemats/tst_xmlpatternsschemats.cpp
b/tests/auto/xmlpatternsschemats/tst_xmlpatternsschemats.cpp
index
f1e379b
..
84bb757
100644
(file)
--- a/
tests/auto/xmlpatternsschemats/tst_xmlpatternsschemats.cpp
+++ b/
tests/auto/xmlpatternsschemats/tst_xmlpatternsschemats.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/ASTItem.cpp
b/tests/auto/xmlpatternssdk/ASTItem.cpp
index
41ed8e0
..
44bf311
100644
(file)
--- a/
tests/auto/xmlpatternssdk/ASTItem.cpp
+++ b/
tests/auto/xmlpatternssdk/ASTItem.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/ASTItem.h
b/tests/auto/xmlpatternssdk/ASTItem.h
index
f563bd6
..
66c857a
100644
(file)
--- a/
tests/auto/xmlpatternssdk/ASTItem.h
+++ b/
tests/auto/xmlpatternssdk/ASTItem.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp
b/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp
index
75a0293
..
39923e2
100644
(file)
--- a/
tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp
+++ b/
tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/DebugExpressionFactory.h
b/tests/auto/xmlpatternssdk/DebugExpressionFactory.h
index
30032c5
..
32a0562
100644
(file)
--- a/
tests/auto/xmlpatternssdk/DebugExpressionFactory.h
+++ b/
tests/auto/xmlpatternssdk/DebugExpressionFactory.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/ErrorHandler.cpp
b/tests/auto/xmlpatternssdk/ErrorHandler.cpp
index
13f46eb
..
47d725c
100644
(file)
--- a/
tests/auto/xmlpatternssdk/ErrorHandler.cpp
+++ b/
tests/auto/xmlpatternssdk/ErrorHandler.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/ErrorHandler.h
b/tests/auto/xmlpatternssdk/ErrorHandler.h
index
28f3311
..
756041e
100644
(file)
--- a/
tests/auto/xmlpatternssdk/ErrorHandler.h
+++ b/
tests/auto/xmlpatternssdk/ErrorHandler.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/ErrorItem.cpp
b/tests/auto/xmlpatternssdk/ErrorItem.cpp
index
442e593
..
e3fb4a6
100644
(file)
--- a/
tests/auto/xmlpatternssdk/ErrorItem.cpp
+++ b/
tests/auto/xmlpatternssdk/ErrorItem.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/ErrorItem.h
b/tests/auto/xmlpatternssdk/ErrorItem.h
index
701d7e2
..
5283233
100644
(file)
--- a/
tests/auto/xmlpatternssdk/ErrorItem.h
+++ b/
tests/auto/xmlpatternssdk/ErrorItem.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/ExitCode.h
b/tests/auto/xmlpatternssdk/ExitCode.h
index
1159d3a
..
583980b
100644
(file)
--- a/
tests/auto/xmlpatternssdk/ExitCode.h
+++ b/
tests/auto/xmlpatternssdk/ExitCode.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/ExpressionInfo.cpp
b/tests/auto/xmlpatternssdk/ExpressionInfo.cpp
index
c7caf02
..
b17bc50
100644
(file)
--- a/
tests/auto/xmlpatternssdk/ExpressionInfo.cpp
+++ b/
tests/auto/xmlpatternssdk/ExpressionInfo.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/ExpressionInfo.h
b/tests/auto/xmlpatternssdk/ExpressionInfo.h
index
3062b06
..
20157f0
100644
(file)
--- a/
tests/auto/xmlpatternssdk/ExpressionInfo.h
+++ b/
tests/auto/xmlpatternssdk/ExpressionInfo.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/ExpressionNamer.cpp
b/tests/auto/xmlpatternssdk/ExpressionNamer.cpp
index
4d62612
..
d5a795a
100644
(file)
--- a/
tests/auto/xmlpatternssdk/ExpressionNamer.cpp
+++ b/
tests/auto/xmlpatternssdk/ExpressionNamer.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/ExpressionNamer.h
b/tests/auto/xmlpatternssdk/ExpressionNamer.h
index
5a32a63
..
9c1f5e5
100644
(file)
--- a/
tests/auto/xmlpatternssdk/ExpressionNamer.h
+++ b/
tests/auto/xmlpatternssdk/ExpressionNamer.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/ExternalSourceLoader.cpp
b/tests/auto/xmlpatternssdk/ExternalSourceLoader.cpp
index
f14c4b8
..
ef020fc
100644
(file)
--- a/
tests/auto/xmlpatternssdk/ExternalSourceLoader.cpp
+++ b/
tests/auto/xmlpatternssdk/ExternalSourceLoader.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/ExternalSourceLoader.h
b/tests/auto/xmlpatternssdk/ExternalSourceLoader.h
index
d34d0d0
..
8247c90
100644
(file)
--- a/
tests/auto/xmlpatternssdk/ExternalSourceLoader.h
+++ b/
tests/auto/xmlpatternssdk/ExternalSourceLoader.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/Global.cpp
b/tests/auto/xmlpatternssdk/Global.cpp
index
1a4a5f9
..
fe01a63
100644
(file)
--- a/
tests/auto/xmlpatternssdk/Global.cpp
+++ b/
tests/auto/xmlpatternssdk/Global.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/Global.h
b/tests/auto/xmlpatternssdk/Global.h
index
fb9472c
..
4979ae6
100644
(file)
--- a/
tests/auto/xmlpatternssdk/Global.h
+++ b/
tests/auto/xmlpatternssdk/Global.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/ResultThreader.cpp
b/tests/auto/xmlpatternssdk/ResultThreader.cpp
index
d40010f
..
1b1a1eb
100644
(file)
--- a/
tests/auto/xmlpatternssdk/ResultThreader.cpp
+++ b/
tests/auto/xmlpatternssdk/ResultThreader.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/ResultThreader.h
b/tests/auto/xmlpatternssdk/ResultThreader.h
index
d20a90b
..
ebe6c2f
100644
(file)
--- a/
tests/auto/xmlpatternssdk/ResultThreader.h
+++ b/
tests/auto/xmlpatternssdk/ResultThreader.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/TestBaseLine.cpp
b/tests/auto/xmlpatternssdk/TestBaseLine.cpp
index
5168565
..
ed3a6d2
100644
(file)
--- a/
tests/auto/xmlpatternssdk/TestBaseLine.cpp
+++ b/
tests/auto/xmlpatternssdk/TestBaseLine.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/TestBaseLine.h
b/tests/auto/xmlpatternssdk/TestBaseLine.h
index
4d54879
..
5f10202
100644
(file)
--- a/
tests/auto/xmlpatternssdk/TestBaseLine.h
+++ b/
tests/auto/xmlpatternssdk/TestBaseLine.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/TestCase.cpp
b/tests/auto/xmlpatternssdk/TestCase.cpp
index
4be9bb1
..
f904bfc
100644
(file)
--- a/
tests/auto/xmlpatternssdk/TestCase.cpp
+++ b/
tests/auto/xmlpatternssdk/TestCase.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/TestCase.h
b/tests/auto/xmlpatternssdk/TestCase.h
index
495c424
..
89a23de
100644
(file)
--- a/
tests/auto/xmlpatternssdk/TestCase.h
+++ b/
tests/auto/xmlpatternssdk/TestCase.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/TestContainer.cpp
b/tests/auto/xmlpatternssdk/TestContainer.cpp
index
676e171
..
6414453
100644
(file)
--- a/
tests/auto/xmlpatternssdk/TestContainer.cpp
+++ b/
tests/auto/xmlpatternssdk/TestContainer.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/TestContainer.h
b/tests/auto/xmlpatternssdk/TestContainer.h
index
bfd65a3
..
f51a766
100644
(file)
--- a/
tests/auto/xmlpatternssdk/TestContainer.h
+++ b/
tests/auto/xmlpatternssdk/TestContainer.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/TestGroup.cpp
b/tests/auto/xmlpatternssdk/TestGroup.cpp
index
3921345
..
9f59193
100644
(file)
--- a/
tests/auto/xmlpatternssdk/TestGroup.cpp
+++ b/
tests/auto/xmlpatternssdk/TestGroup.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/TestGroup.h
b/tests/auto/xmlpatternssdk/TestGroup.h
index
cd9c34c
..
3c7a0a5
100644
(file)
--- a/
tests/auto/xmlpatternssdk/TestGroup.h
+++ b/
tests/auto/xmlpatternssdk/TestGroup.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/TestItem.h
b/tests/auto/xmlpatternssdk/TestItem.h
index
4deb1b7
..
fd85777
100644
(file)
--- a/
tests/auto/xmlpatternssdk/TestItem.h
+++ b/
tests/auto/xmlpatternssdk/TestItem.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/TestResult.cpp
b/tests/auto/xmlpatternssdk/TestResult.cpp
index
010b554
..
5dced1f
100644
(file)
--- a/
tests/auto/xmlpatternssdk/TestResult.cpp
+++ b/
tests/auto/xmlpatternssdk/TestResult.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/TestResult.h
b/tests/auto/xmlpatternssdk/TestResult.h
index
5f7b6e8
..
b36f41f
100644
(file)
--- a/
tests/auto/xmlpatternssdk/TestResult.h
+++ b/
tests/auto/xmlpatternssdk/TestResult.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/TestResultHandler.cpp
b/tests/auto/xmlpatternssdk/TestResultHandler.cpp
index
3f22ec9
..
d57f8b1
100644
(file)
--- a/
tests/auto/xmlpatternssdk/TestResultHandler.cpp
+++ b/
tests/auto/xmlpatternssdk/TestResultHandler.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/TestResultHandler.h
b/tests/auto/xmlpatternssdk/TestResultHandler.h
index
28ec292
..
1d5cfcf
100644
(file)
--- a/
tests/auto/xmlpatternssdk/TestResultHandler.h
+++ b/
tests/auto/xmlpatternssdk/TestResultHandler.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/TestSuite.cpp
b/tests/auto/xmlpatternssdk/TestSuite.cpp
index
fa28ca3
..
c35e5f8
100644
(file)
--- a/
tests/auto/xmlpatternssdk/TestSuite.cpp
+++ b/
tests/auto/xmlpatternssdk/TestSuite.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/TestSuite.h
b/tests/auto/xmlpatternssdk/TestSuite.h
index
3728218
..
efd628a
100644
(file)
--- a/
tests/auto/xmlpatternssdk/TestSuite.h
+++ b/
tests/auto/xmlpatternssdk/TestSuite.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/TestSuiteHandler.cpp
b/tests/auto/xmlpatternssdk/TestSuiteHandler.cpp
index
33be13a
..
5de793b
100644
(file)
--- a/
tests/auto/xmlpatternssdk/TestSuiteHandler.cpp
+++ b/
tests/auto/xmlpatternssdk/TestSuiteHandler.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/TestSuiteHandler.h
b/tests/auto/xmlpatternssdk/TestSuiteHandler.h
index
1a64dd0
..
710f59d
100644
(file)
--- a/
tests/auto/xmlpatternssdk/TestSuiteHandler.h
+++ b/
tests/auto/xmlpatternssdk/TestSuiteHandler.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/TestSuiteResult.cpp
b/tests/auto/xmlpatternssdk/TestSuiteResult.cpp
index
ed49731
..
e70e9a4
100644
(file)
--- a/
tests/auto/xmlpatternssdk/TestSuiteResult.cpp
+++ b/
tests/auto/xmlpatternssdk/TestSuiteResult.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/TestSuiteResult.h
b/tests/auto/xmlpatternssdk/TestSuiteResult.h
index
7ee89cc
..
50fc4ac
100644
(file)
--- a/
tests/auto/xmlpatternssdk/TestSuiteResult.h
+++ b/
tests/auto/xmlpatternssdk/TestSuiteResult.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/TreeItem.cpp
b/tests/auto/xmlpatternssdk/TreeItem.cpp
index
776c345
..
91360d5
100644
(file)
--- a/
tests/auto/xmlpatternssdk/TreeItem.cpp
+++ b/
tests/auto/xmlpatternssdk/TreeItem.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/TreeItem.h
b/tests/auto/xmlpatternssdk/TreeItem.h
index
9316347
..
6f5e1b4
100644
(file)
--- a/
tests/auto/xmlpatternssdk/TreeItem.h
+++ b/
tests/auto/xmlpatternssdk/TreeItem.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/TreeModel.cpp
b/tests/auto/xmlpatternssdk/TreeModel.cpp
index
0fdc441
..
e80e316
100644
(file)
--- a/
tests/auto/xmlpatternssdk/TreeModel.cpp
+++ b/
tests/auto/xmlpatternssdk/TreeModel.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/TreeModel.h
b/tests/auto/xmlpatternssdk/TreeModel.h
index
50dfe41
..
b8eda04
100644
(file)
--- a/
tests/auto/xmlpatternssdk/TreeModel.h
+++ b/
tests/auto/xmlpatternssdk/TreeModel.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/Worker.cpp
b/tests/auto/xmlpatternssdk/Worker.cpp
index
b6001bf
..
c1c74a3
100644
(file)
--- a/
tests/auto/xmlpatternssdk/Worker.cpp
+++ b/
tests/auto/xmlpatternssdk/Worker.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/Worker.h
b/tests/auto/xmlpatternssdk/Worker.h
index
ab42495
..
45329b4
100644
(file)
--- a/
tests/auto/xmlpatternssdk/Worker.h
+++ b/
tests/auto/xmlpatternssdk/Worker.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/XMLWriter.cpp
b/tests/auto/xmlpatternssdk/XMLWriter.cpp
index
a81a986
..
00f381b
100644
(file)
--- a/
tests/auto/xmlpatternssdk/XMLWriter.cpp
+++ b/
tests/auto/xmlpatternssdk/XMLWriter.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/XMLWriter.h
b/tests/auto/xmlpatternssdk/XMLWriter.h
index
025fca4
..
c05709d
100644
(file)
--- a/
tests/auto/xmlpatternssdk/XMLWriter.h
+++ b/
tests/auto/xmlpatternssdk/XMLWriter.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/XQTSTestCase.cpp
b/tests/auto/xmlpatternssdk/XQTSTestCase.cpp
index
df00253
..
4e2a7bf
100644
(file)
--- a/
tests/auto/xmlpatternssdk/XQTSTestCase.cpp
+++ b/
tests/auto/xmlpatternssdk/XQTSTestCase.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/XQTSTestCase.h
b/tests/auto/xmlpatternssdk/XQTSTestCase.h
index
d921d1d
..
c0cc8c3
100644
(file)
--- a/
tests/auto/xmlpatternssdk/XQTSTestCase.h
+++ b/
tests/auto/xmlpatternssdk/XQTSTestCase.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/XSDTSTestCase.cpp
b/tests/auto/xmlpatternssdk/XSDTSTestCase.cpp
index
1440d38
..
3c54874
100644
(file)
--- a/
tests/auto/xmlpatternssdk/XSDTSTestCase.cpp
+++ b/
tests/auto/xmlpatternssdk/XSDTSTestCase.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the autotests of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the autotests of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/XSDTSTestCase.h
b/tests/auto/xmlpatternssdk/XSDTSTestCase.h
index
193b6c6
..
1902d93
100644
(file)
--- a/
tests/auto/xmlpatternssdk/XSDTSTestCase.h
+++ b/
tests/auto/xmlpatternssdk/XSDTSTestCase.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the autotests of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the autotests of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.cpp
b/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.cpp
index
1b35cae
..
898a435
100644
(file)
--- a/
tests/auto/xmlpatternssdk/XSDTestSuiteHandler.cpp
+++ b/
tests/auto/xmlpatternssdk/XSDTestSuiteHandler.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the autotests of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the autotests of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.h
b/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.h
index
5c9a97a
..
02adf1e
100644
(file)
--- a/
tests/auto/xmlpatternssdk/XSDTestSuiteHandler.h
+++ b/
tests/auto/xmlpatternssdk/XSDTestSuiteHandler.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the autotests of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the autotests of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp
b/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp
index
81dc9bd
..
22c4787
100644
(file)
--- a/
tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp
+++ b/
tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.h
b/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.h
index
e7e94fb
..
7f7b422
100644
(file)
--- a/
tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.h
+++ b/
tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/docs/XMLIndenterExample.cpp
b/tests/auto/xmlpatternssdk/docs/XMLIndenterExample.cpp
index
11c28ad
..
e3e0462
100644
(file)
--- a/
tests/auto/xmlpatternssdk/docs/XMLIndenterExample.cpp
+++ b/
tests/auto/xmlpatternssdk/docs/XMLIndenterExample.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/docs/XMLWriterExample.cpp
b/tests/auto/xmlpatternssdk/docs/XMLWriterExample.cpp
index
11c28ad
..
e3e0462
100644
(file)
--- a/
tests/auto/xmlpatternssdk/docs/XMLWriterExample.cpp
+++ b/
tests/auto/xmlpatternssdk/docs/XMLWriterExample.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/tests/XMLWriterTest.cpp
b/tests/auto/xmlpatternssdk/tests/XMLWriterTest.cpp
index
940c787
..
fb3acf0
100644
(file)
--- a/
tests/auto/xmlpatternssdk/tests/XMLWriterTest.cpp
+++ b/
tests/auto/xmlpatternssdk/tests/XMLWriterTest.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternssdk/tests/XMLWriterTest.h
b/tests/auto/xmlpatternssdk/tests/XMLWriterTest.h
index
66a2678
..
bf0ef70
100644
(file)
--- a/
tests/auto/xmlpatternssdk/tests/XMLWriterTest.h
+++ b/
tests/auto/xmlpatternssdk/tests/XMLWriterTest.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp
b/tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp
index
e994b9e
..
f652eae
100644
(file)
--- a/
tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp
+++ b/
tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternsview/tst_xmlpatternsview.cpp
b/tests/auto/xmlpatternsview/tst_xmlpatternsview.cpp
index
392cfc4
..
a84357b
100644
(file)
--- a/
tests/auto/xmlpatternsview/tst_xmlpatternsview.cpp
+++ b/
tests/auto/xmlpatternsview/tst_xmlpatternsview.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternsview/view/FunctionSignaturesView.cpp
b/tests/auto/xmlpatternsview/view/FunctionSignaturesView.cpp
index
586cde5
..
8ab9711
100644
(file)
--- a/
tests/auto/xmlpatternsview/view/FunctionSignaturesView.cpp
+++ b/
tests/auto/xmlpatternsview/view/FunctionSignaturesView.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternsview/view/FunctionSignaturesView.h
b/tests/auto/xmlpatternsview/view/FunctionSignaturesView.h
index
03bb0a4
..
55c58a4
100644
(file)
--- a/
tests/auto/xmlpatternsview/view/FunctionSignaturesView.h
+++ b/
tests/auto/xmlpatternsview/view/FunctionSignaturesView.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternsview/view/MainWindow.cpp
b/tests/auto/xmlpatternsview/view/MainWindow.cpp
index
fd852e5
..
01a335e
100644
(file)
--- a/
tests/auto/xmlpatternsview/view/MainWindow.cpp
+++ b/
tests/auto/xmlpatternsview/view/MainWindow.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternsview/view/MainWindow.h
b/tests/auto/xmlpatternsview/view/MainWindow.h
index
4ecfac6
..
45bd0e0
100644
(file)
--- a/
tests/auto/xmlpatternsview/view/MainWindow.h
+++ b/
tests/auto/xmlpatternsview/view/MainWindow.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternsview/view/TestCaseView.cpp
b/tests/auto/xmlpatternsview/view/TestCaseView.cpp
index
2e99490
..
a68f893
100644
(file)
--- a/
tests/auto/xmlpatternsview/view/TestCaseView.cpp
+++ b/
tests/auto/xmlpatternsview/view/TestCaseView.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternsview/view/TestCaseView.h
b/tests/auto/xmlpatternsview/view/TestCaseView.h
index
9eddce9
..
155ae8d
100644
(file)
--- a/
tests/auto/xmlpatternsview/view/TestCaseView.h
+++ b/
tests/auto/xmlpatternsview/view/TestCaseView.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternsview/view/TestResultView.cpp
b/tests/auto/xmlpatternsview/view/TestResultView.cpp
index
d6a8900
..
a2a9147
100644
(file)
--- a/
tests/auto/xmlpatternsview/view/TestResultView.cpp
+++ b/
tests/auto/xmlpatternsview/view/TestResultView.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternsview/view/TestResultView.h
b/tests/auto/xmlpatternsview/view/TestResultView.h
index
67730cc
..
f5cae15
100644
(file)
--- a/
tests/auto/xmlpatternsview/view/TestResultView.h
+++ b/
tests/auto/xmlpatternsview/view/TestResultView.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternsview/view/TreeSortFilter.cpp
b/tests/auto/xmlpatternsview/view/TreeSortFilter.cpp
index
504c1e8
..
bce14e5
100644
(file)
--- a/
tests/auto/xmlpatternsview/view/TreeSortFilter.cpp
+++ b/
tests/auto/xmlpatternsview/view/TreeSortFilter.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternsview/view/TreeSortFilter.h
b/tests/auto/xmlpatternsview/view/TreeSortFilter.h
index
83cdd5b
..
33a87a4
100644
(file)
--- a/
tests/auto/xmlpatternsview/view/TreeSortFilter.h
+++ b/
tests/auto/xmlpatternsview/view/TreeSortFilter.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternsview/view/UserTestCase.cpp
b/tests/auto/xmlpatternsview/view/UserTestCase.cpp
index
6b2f53b
..
2b988cc
100644
(file)
--- a/
tests/auto/xmlpatternsview/view/UserTestCase.cpp
+++ b/
tests/auto/xmlpatternsview/view/UserTestCase.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternsview/view/UserTestCase.h
b/tests/auto/xmlpatternsview/view/UserTestCase.h
index
246885a
..
0d2ca86
100644
(file)
--- a/
tests/auto/xmlpatternsview/view/UserTestCase.h
+++ b/
tests/auto/xmlpatternsview/view/UserTestCase.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternsview/view/XDTItemItem.cpp
b/tests/auto/xmlpatternsview/view/XDTItemItem.cpp
index
7adf44b
..
1fc29f8
100644
(file)
--- a/
tests/auto/xmlpatternsview/view/XDTItemItem.cpp
+++ b/
tests/auto/xmlpatternsview/view/XDTItemItem.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternsview/view/XDTItemItem.h
b/tests/auto/xmlpatternsview/view/XDTItemItem.h
index
d1aa973
..
63e719a
100644
(file)
--- a/
tests/auto/xmlpatternsview/view/XDTItemItem.h
+++ b/
tests/auto/xmlpatternsview/view/XDTItemItem.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternsview/view/main.cpp
b/tests/auto/xmlpatternsview/view/main.cpp
index
a455b3d
..
fb05948
100644
(file)
--- a/
tests/auto/xmlpatternsview/view/main.cpp
+++ b/
tests/auto/xmlpatternsview/view/main.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternsxqts/TESTSUITE/updateSuite.sh
b/tests/auto/xmlpatternsxqts/TESTSUITE/updateSuite.sh
index
3a4dca5
..
bdbf903
100755
(executable)
--- a/
tests/auto/xmlpatternsxqts/TESTSUITE/updateSuite.sh
+++ b/
tests/auto/xmlpatternsxqts/TESTSUITE/updateSuite.sh
@@
-1,39
+1,39
@@
#!/bin/sh
#############################################################################
##
#!/bin/sh
#############################################################################
##
-## Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-## Contact: http://www.qt-project.org/
+## Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+## Contact: http://www.qt-project.org/
legal
##
## This file is the build configuration utility of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL$
##
## This file is the build configuration utility of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Digia. For licensing terms and
+## conditions see http://qt.digia.com/licensing. For further information
+## use the contact form at http://qt.digia.com/contact-us.
+##
## GNU Lesser General Public License Usage
## GNU Lesser General Public License Usage
-##
This file may be used under the terms of the GNU Lesser General Public
-##
License version 2.1 as published by the Free Software Foundation and
-##
appearing in the file LICENSE.LGPL included in the packaging of this
-##
file. Please review the following information to ensure the GNU Lesser
-##
General Public License version 2.1 requirements will be met:
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
Alternatively, this file may be used under the terms of the GNU Lesser
+##
General Public License version 2.1 as published by the Free Software
+##
Foundation and appearing in the file LICENSE.LGPL included in the
+##
packaging of this file. Please review the following information to
+##
ensure the GNU Lesser General Public License version 2.1 requirements
+##
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
##
-## In addition, as a special exception,
Nok
ia gives you certain additional
-## rights.
These rights are described in the Nok
ia Qt LGPL Exception
+## In addition, as a special exception,
Dig
ia gives you certain additional
+## rights.
These rights are described in the Dig
ia Qt LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## GNU General Public License Usage
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU General
-## Public License version 3.0 as published by the Free Software Foundation
-## and appearing in the file LICENSE.GPL included in the packaging of this
-## file. Please review the following information to ensure the GNU General
-## Public License version 3.0 requirements will be met:
-## http://www.gnu.org/copyleft/gpl.html.
-##
-## Other Usage
-## Alternatively, this file may be used in accordance with the terms and
-## conditions contained in a signed written agreement between you and Nokia.
-##
-##
-##
-##
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3.0 as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU General Public License version 3.0 requirements will be
+## met: http://www.gnu.org/copyleft/gpl.html.
##
##
## $QT_END_LICENSE$
##
##
## $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternsxqts/summarizeBaseline.sh
b/tests/auto/xmlpatternsxqts/summarizeBaseline.sh
index
f5be70b
..
cc76ab2
100755
(executable)
--- a/
tests/auto/xmlpatternsxqts/summarizeBaseline.sh
+++ b/
tests/auto/xmlpatternsxqts/summarizeBaseline.sh
@@
-1,39
+1,39
@@
#!/bin/sh
#############################################################################
##
#!/bin/sh
#############################################################################
##
-## Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-## Contact: http://www.qt-project.org/
+## Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+## Contact: http://www.qt-project.org/
legal
##
## This file is the build configuration utility of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL$
##
## This file is the build configuration utility of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Digia. For licensing terms and
+## conditions see http://qt.digia.com/licensing. For further information
+## use the contact form at http://qt.digia.com/contact-us.
+##
## GNU Lesser General Public License Usage
## GNU Lesser General Public License Usage
-##
This file may be used under the terms of the GNU Lesser General Public
-##
License version 2.1 as published by the Free Software Foundation and
-##
appearing in the file LICENSE.LGPL included in the packaging of this
-##
file. Please review the following information to ensure the GNU Lesser
-##
General Public License version 2.1 requirements will be met:
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## In addition, as a special exception,
Nok
ia gives you certain additional
-## rights.
These rights are described in the Nok
ia Qt LGPL Exception
+##
Alternatively, this file may be used under the terms of the GNU Lesser
+##
General Public License version 2.1 as published by the Free Software
+##
Foundation and appearing in the file LICENSE.LGPL included in the
+##
packaging of this file. Please review the following information to
+##
ensure the GNU Lesser General Public License version 2.1 requirements
+##
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception,
Dig
ia gives you certain additional
+## rights.
These rights are described in the Dig
ia Qt LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## GNU General Public License Usage
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU General
-## Public License version 3.0 as published by the Free Software Foundation
-## and appearing in the file LICENSE.GPL included in the packaging of this
-## file. Please review the following information to ensure the GNU General
-## Public License version 3.0 requirements will be met:
-## http://www.gnu.org/copyleft/gpl.html.
-##
-## Other Usage
-## Alternatively, this file may be used in accordance with the terms and
-## conditions contained in a signed written agreement between you and Nokia.
-##
-##
-##
-##
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3.0 as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU General Public License version 3.0 requirements will be
+## met: http://www.gnu.org/copyleft/gpl.html.
##
##
## $QT_END_LICENSE$
##
##
## $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternsxqts/tst_suitetest.cpp
b/tests/auto/xmlpatternsxqts/tst_suitetest.cpp
index
f61546f
..
74cfe11
100644
(file)
--- a/
tests/auto/xmlpatternsxqts/tst_suitetest.cpp
+++ b/
tests/auto/xmlpatternsxqts/tst_suitetest.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternsxqts/tst_suitetest.h
b/tests/auto/xmlpatternsxqts/tst_suitetest.h
index
897826b
..
cc35cd8
100644
(file)
--- a/
tests/auto/xmlpatternsxqts/tst_suitetest.h
+++ b/
tests/auto/xmlpatternsxqts/tst_suitetest.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternsxqts/tst_xmlpatternsxqts.cpp
b/tests/auto/xmlpatternsxqts/tst_xmlpatternsxqts.cpp
index
71040dd
..
f8507bb
100644
(file)
--- a/
tests/auto/xmlpatternsxqts/tst_xmlpatternsxqts.cpp
+++ b/
tests/auto/xmlpatternsxqts/tst_xmlpatternsxqts.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternsxslts/XSLTS/updateSuite.sh
b/tests/auto/xmlpatternsxslts/XSLTS/updateSuite.sh
index
5125406
..
163f604
100755
(executable)
--- a/
tests/auto/xmlpatternsxslts/XSLTS/updateSuite.sh
+++ b/
tests/auto/xmlpatternsxslts/XSLTS/updateSuite.sh
@@
-1,39
+1,39
@@
#!/bin/sh
#############################################################################
##
#!/bin/sh
#############################################################################
##
-## Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-## Contact: http://www.qt-project.org/
+## Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+## Contact: http://www.qt-project.org/
legal
##
## This file is the build configuration utility of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL$
##
## This file is the build configuration utility of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Digia. For licensing terms and
+## conditions see http://qt.digia.com/licensing. For further information
+## use the contact form at http://qt.digia.com/contact-us.
+##
## GNU Lesser General Public License Usage
## GNU Lesser General Public License Usage
-##
This file may be used under the terms of the GNU Lesser General Public
-##
License version 2.1 as published by the Free Software Foundation and
-##
appearing in the file LICENSE.LGPL included in the packaging of this
-##
file. Please review the following information to ensure the GNU Lesser
-##
General Public License version 2.1 requirements will be met:
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## In addition, as a special exception,
Nok
ia gives you certain additional
-## rights.
These rights are described in the Nok
ia Qt LGPL Exception
+##
Alternatively, this file may be used under the terms of the GNU Lesser
+##
General Public License version 2.1 as published by the Free Software
+##
Foundation and appearing in the file LICENSE.LGPL included in the
+##
packaging of this file. Please review the following information to
+##
ensure the GNU Lesser General Public License version 2.1 requirements
+##
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception,
Dig
ia gives you certain additional
+## rights.
These rights are described in the Dig
ia Qt LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## GNU General Public License Usage
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU General
-## Public License version 3.0 as published by the Free Software Foundation
-## and appearing in the file LICENSE.GPL included in the packaging of this
-## file. Please review the following information to ensure the GNU General
-## Public License version 3.0 requirements will be met:
-## http://www.gnu.org/copyleft/gpl.html.
-##
-## Other Usage
-## Alternatively, this file may be used in accordance with the terms and
-## conditions contained in a signed written agreement between you and Nokia.
-##
-##
-##
-##
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3.0 as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU General Public License version 3.0 requirements will be
+## met: http://www.gnu.org/copyleft/gpl.html.
##
##
## $QT_END_LICENSE$
##
##
## $QT_END_LICENSE$
diff --git
a/tests/auto/xmlpatternsxslts/tst_xmlpatternsxslts.cpp
b/tests/auto/xmlpatternsxslts/tst_xmlpatternsxslts.cpp
index
9568198
..
6fb6180
100644
(file)
--- a/
tests/auto/xmlpatternsxslts/tst_xmlpatternsxslts.cpp
+++ b/
tests/auto/xmlpatternsxslts/tst_xmlpatternsxslts.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tools/xmlpatterns/main.cpp
b/tools/xmlpatterns/main.cpp
index
171c6e5
..
f7baef2
100644
(file)
--- a/
tools/xmlpatterns/main.cpp
+++ b/
tools/xmlpatterns/main.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tools/xmlpatterns/main.h
b/tools/xmlpatterns/main.h
index
fd8a717
..
47ba3ed
100644
(file)
--- a/
tools/xmlpatterns/main.h
+++ b/
tools/xmlpatterns/main.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the XMLPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the XMLPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tools/xmlpatterns/qapplicationargument.cpp
b/tools/xmlpatterns/qapplicationargument.cpp
index
d400a59
..
6523265
100644
(file)
--- a/
tools/xmlpatterns/qapplicationargument.cpp
+++ b/
tools/xmlpatterns/qapplicationargument.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the tools applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the tools applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tools/xmlpatterns/qapplicationargument_p.h
b/tools/xmlpatterns/qapplicationargument_p.h
index
fb388a5
..
0fa0343
100644
(file)
--- a/
tools/xmlpatterns/qapplicationargument_p.h
+++ b/
tools/xmlpatterns/qapplicationargument_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the tools applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the tools applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tools/xmlpatterns/qapplicationargumentparser.cpp
b/tools/xmlpatterns/qapplicationargumentparser.cpp
index
c5dad71
..
0805ed0
100644
(file)
--- a/
tools/xmlpatterns/qapplicationargumentparser.cpp
+++ b/
tools/xmlpatterns/qapplicationargumentparser.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the tools applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the tools applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tools/xmlpatterns/qapplicationargumentparser_p.h
b/tools/xmlpatterns/qapplicationargumentparser_p.h
index
fa1584f
..
0d9bf08
100644
(file)
--- a/
tools/xmlpatterns/qapplicationargumentparser_p.h
+++ b/
tools/xmlpatterns/qapplicationargumentparser_p.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the tools applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the tools applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tools/xmlpatternsvalidator/main.cpp
b/tools/xmlpatternsvalidator/main.cpp
index
c19ee3c
..
e7537a0
100644
(file)
--- a/
tools/xmlpatternsvalidator/main.cpp
+++ b/
tools/xmlpatternsvalidator/main.cpp
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$
diff --git
a/tools/xmlpatternsvalidator/main.h
b/tools/xmlpatternsvalidator/main.h
index
d05f5dc
..
99a9871
100644
(file)
--- a/
tools/xmlpatternsvalidator/main.h
+++ b/
tools/xmlpatternsvalidator/main.h
@@
-1,38
+1,38
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2012
Nokia Corporation
and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012
Digia Plc
and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
legal
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
** GNU Lesser General Public License Usage
-**
This file may be used under the terms of the GNU Lesser General Public
-**
License version 2.1 as published by the Free Software Foundation and
-**
appearing in the file LICENSE.LGPL included in the packaging of this
-**
file. Please review the following information to ensure the GNU Lesser
-**
General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
Alternatively, this file may be used under the terms of the GNU Lesser
+**
General Public License version 2.1 as published by the Free Software
+**
Foundation and appearing in the file LICENSE.LGPL included in the
+**
packaging of this file. Please review the following information to
+**
ensure the GNU Lesser General Public License version 2.1 requirements
+**
will be met:
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
**
-** In addition, as a special exception,
Nok
ia gives you certain additional
-** rights.
These rights are described in the Nok
ia Qt LGPL Exception
+** In addition, as a special exception,
Dig
ia gives you certain additional
+** rights.
These rights are described in the Dig
ia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
**
** $QT_END_LICENSE$