Merge "Merge remote-tracking branch 'origin/5.8' into 5.9" into refs/staging/5.9
This commit is contained in:
Liang Qi
The Qt Project
commit
d5df0e9949
@ -3,19 +3,18 @@ CONFIG += no_docs_target
|
|||||||
|
|
||||||
SUBDIRS = \
|
SUBDIRS = \
|
||||||
corelib \
|
corelib \
|
||||||
dbus \
|
|
||||||
embedded \
|
embedded \
|
||||||
gui \
|
|
||||||
network \
|
|
||||||
qpa \
|
qpa \
|
||||||
qtconcurrent \
|
touch
|
||||||
qtestlib \
|
|
||||||
sql \
|
|
||||||
touch \
|
|
||||||
widgets \
|
|
||||||
xml
|
|
||||||
|
|
||||||
qtHaveModule(gui):qtConfig(opengl): SUBDIRS += opengl
|
qtHaveModule(dbus): SUBDIRS += dbus
|
||||||
|
qtHaveModule(network): SUBDIRS += network
|
||||||
|
qtHaveModule(testlib): SUBDIRS += qtestlib
|
||||||
|
qtHaveModule(concurrent): SUBDIRS += qtconcurrent
|
||||||
|
qtHaveModule(sql): SUBDIRS += sql
|
||||||
|
qtHaveModule(widgets): SUBDIRS += widgets
|
||||||
|
qtHaveModule(xml): SUBDIRS += xml
|
||||||
|
qtHaveModule(gui): SUBDIRS += gui opengl
|
||||||
|
|
||||||
aggregate.files = aggregate/examples.pro
|
aggregate.files = aggregate/examples.pro
|
||||||
aggregate.path = $$[QT_INSTALL_EXAMPLES]
|
aggregate.path = $$[QT_INSTALL_EXAMPLES]
|
||||||
|
|||||||
@ -8,7 +8,7 @@ SUBDIRS = books \
|
|||||||
relationaltablemodel \
|
relationaltablemodel \
|
||||||
sqlwidgetmapper
|
sqlwidgetmapper
|
||||||
|
|
||||||
!wince: SUBDIRS += masterdetail
|
!wince:qtHaveModule(xml): SUBDIRS += masterdetail
|
||||||
|
|
||||||
!wince: SUBDIRS += \
|
!wince: SUBDIRS += \
|
||||||
querymodel \
|
querymodel \
|
||||||
|
|||||||
@ -20,3 +20,4 @@ SUBDIRS = addressbook \
|
|||||||
stardelegate \
|
stardelegate \
|
||||||
storageview
|
storageview
|
||||||
contains(DEFINES, QT_NO_DRAGANDDROP): SUBDIRS -= puzzle
|
contains(DEFINES, QT_NO_DRAGANDDROP): SUBDIRS -= puzzle
|
||||||
|
!qtHaveModule(xml): SUBDIRS -= simpledommodel
|
||||||
|
|||||||
@ -90,7 +90,7 @@ warnings_are_errors:warning_clean {
|
|||||||
# (NULL in C++ is usually a literal 0)
|
# (NULL in C++ is usually a literal 0)
|
||||||
QMAKE_CXXFLAGS_WARN_ON += -Werror -ww177,1224,1478,1881 $$WERROR
|
QMAKE_CXXFLAGS_WARN_ON += -Werror -ww177,1224,1478,1881 $$WERROR
|
||||||
}
|
}
|
||||||
} else:gcc:!clang:!intel_icc {
|
} else:gcc:!clang:!intel_icc:!rim_qcc {
|
||||||
# GCC 4.6-4.9, 5.x, ...
|
# GCC 4.6-4.9, 5.x, ...
|
||||||
ver = $${QT_GCC_MAJOR_VERSION}.$${QT_GCC_MINOR_VERSION}
|
ver = $${QT_GCC_MAJOR_VERSION}.$${QT_GCC_MINOR_VERSION}
|
||||||
contains(ver, "(4\\.[6789]|[5-9]\\..)") {
|
contains(ver, "(4\\.[6789]|[5-9]\\..)") {
|
||||||
|
|||||||
@ -41,8 +41,12 @@ host_build {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
CONFIG(shared, static|shared):qtConfig(framework): \
|
qtConfig(framework) {
|
||||||
CONFIG += lib_bundle
|
minimal_syncqt: \
|
||||||
|
CONFIG += module_frameworks
|
||||||
|
else: CONFIG(shared, static|shared): \
|
||||||
|
CONFIG += module_frameworks lib_bundle
|
||||||
|
}
|
||||||
|
|
||||||
CONFIG += relative_qt_rpath # Qt libraries should be relocatable
|
CONFIG += relative_qt_rpath # Qt libraries should be relocatable
|
||||||
|
|
||||||
|
|||||||
@ -59,7 +59,9 @@ load(qt_build_paths)
|
|||||||
# even beyond the module's own build. The implication of this is that
|
# even beyond the module's own build. The implication of this is that
|
||||||
# qmake might never use a framework's headers in a non-prefix build,
|
# qmake might never use a framework's headers in a non-prefix build,
|
||||||
# as there is no separate set of .pri files for users outside Qt.
|
# as there is no separate set of .pri files for users outside Qt.
|
||||||
prefix_build:lib_bundle: \
|
# Borrowing is assumed to happen from modules which, in a framework build,
|
||||||
|
# actually are frameworks.
|
||||||
|
prefix_build:module_frameworks: \
|
||||||
fwd = _FWD
|
fwd = _FWD
|
||||||
# When using a split include path during the build, the installed module's
|
# When using a split include path during the build, the installed module's
|
||||||
# include path is also structurally different from that in the build dir.
|
# include path is also structurally different from that in the build dir.
|
||||||
@ -82,7 +84,7 @@ for(mod, MODULE_INCNAME) {
|
|||||||
generated_privates: \
|
generated_privates: \
|
||||||
MODULE$${sfwd}$${prv}_INCLUDES += $$mbibase/$$VERSION $$mbibase/$$VERSION/$$mod
|
MODULE$${sfwd}$${prv}_INCLUDES += $$mbibase/$$VERSION $$mbibase/$$VERSION/$$mod
|
||||||
}
|
}
|
||||||
prefix_build:lib_bundle {
|
prefix_build:module_frameworks {
|
||||||
mfbase = \$\$QT_MODULE_LIB_BASE/$${mod}.framework/Headers
|
mfbase = \$\$QT_MODULE_LIB_BASE/$${mod}.framework/Headers
|
||||||
MODULE_INCLUDES += $$mfbase
|
MODULE_INCLUDES += $$mfbase
|
||||||
MODULE$${prv}_INCLUDES += $$mfbase/$$VERSION $$mfbase/$$VERSION/$$mod
|
MODULE$${prv}_INCLUDES += $$mfbase/$$VERSION $$mfbase/$$VERSION/$$mod
|
||||||
@ -178,7 +180,7 @@ headersclean:!internal_module {
|
|||||||
-Dforeach=public: \
|
-Dforeach=public: \
|
||||||
-Dforever=public:
|
-Dforever=public:
|
||||||
|
|
||||||
gcc {
|
gcc:!rim_qcc {
|
||||||
# Turn on some extra warnings not found in -Wall -Wextra.
|
# Turn on some extra warnings not found in -Wall -Wextra.
|
||||||
# Common to GCC, Clang and ICC (and other compilers that masquerade as GCC):
|
# Common to GCC, Clang and ICC (and other compilers that masquerade as GCC):
|
||||||
hcleanFLAGS = -Wall -Wextra -Werror \
|
hcleanFLAGS = -Wall -Wextra -Werror \
|
||||||
|
|||||||
@ -83,10 +83,10 @@ defineReplace(qtExportLibsForModule) {
|
|||||||
module_build_type = v2
|
module_build_type = v2
|
||||||
static: \
|
static: \
|
||||||
module_build_type += staticlib
|
module_build_type += staticlib
|
||||||
lib_bundle {
|
lib_bundle: \
|
||||||
module_build_type += lib_bundle
|
module_build_type += lib_bundle
|
||||||
|
module_frameworks: \
|
||||||
MODULE_FRAMEWORKS = " \$\$QT_MODULE_LIB_BASE"
|
MODULE_FRAMEWORKS = " \$\$QT_MODULE_LIB_BASE"
|
||||||
}
|
|
||||||
internal_module: \
|
internal_module: \
|
||||||
module_build_type += internal_module
|
module_build_type += internal_module
|
||||||
ltcg: \
|
ltcg: \
|
||||||
|
|||||||
965
src/3rdparty/gradle/LICENSE-GRADLEW.txt
vendored
Normal file
965
src/3rdparty/gradle/LICENSE-GRADLEW.txt
vendored
Normal file
@ -0,0 +1,965 @@
|
|||||||
|
|
||||||
|
Apache License
|
||||||
|
Version 2.0, January 2004
|
||||||
|
http://www.apache.org/licenses/
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||||
|
|
||||||
|
1. Definitions.
|
||||||
|
|
||||||
|
"License" shall mean the terms and conditions for use, reproduction,
|
||||||
|
and distribution as defined by Sections 1 through 9 of this document.
|
||||||
|
|
||||||
|
"Licensor" shall mean the copyright owner or entity authorized by
|
||||||
|
the copyright owner that is granting the License.
|
||||||
|
|
||||||
|
"Legal Entity" shall mean the union of the acting entity and all
|
||||||
|
other entities that control, are controlled by, or are under common
|
||||||
|
control with that entity. For the purposes of this definition,
|
||||||
|
"control" means (i) the power, direct or indirect, to cause the
|
||||||
|
direction or management of such entity, whether by contract or
|
||||||
|
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||||
|
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||||
|
|
||||||
|
"You" (or "Your") shall mean an individual or Legal Entity
|
||||||
|
exercising permissions granted by this License.
|
||||||
|
|
||||||
|
"Source" form shall mean the preferred form for making modifications,
|
||||||
|
including but not limited to software source code, documentation
|
||||||
|
source, and configuration files.
|
||||||
|
|
||||||
|
"Object" form shall mean any form resulting from mechanical
|
||||||
|
transformation or translation of a Source form, including but
|
||||||
|
not limited to compiled object code, generated documentation,
|
||||||
|
and conversions to other media types.
|
||||||
|
|
||||||
|
"Work" shall mean the work of authorship, whether in Source or
|
||||||
|
Object form, made available under the License, as indicated by a
|
||||||
|
copyright notice that is included in or attached to the work
|
||||||
|
(an example is provided in the Appendix below).
|
||||||
|
|
||||||
|
"Derivative Works" shall mean any work, whether in Source or Object
|
||||||
|
form, that is based on (or derived from) the Work and for which the
|
||||||
|
editorial revisions, annotations, elaborations, or other modifications
|
||||||
|
represent, as a whole, an original work of authorship. For the purposes
|
||||||
|
of this License, Derivative Works shall not include works that remain
|
||||||
|
separable from, or merely link (or bind by name) to the interfaces of,
|
||||||
|
the Work and Derivative Works thereof.
|
||||||
|
|
||||||
|
"Contribution" shall mean any work of authorship, including
|
||||||
|
the original version of the Work and any modifications or additions
|
||||||
|
to that Work or Derivative Works thereof, that is intentionally
|
||||||
|
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||||
|
or by an individual or Legal Entity authorized to submit on behalf of
|
||||||
|
the copyright owner. For the purposes of this definition, "submitted"
|
||||||
|
means any form of electronic, verbal, or written communication sent
|
||||||
|
to the Licensor or its representatives, including but not limited to
|
||||||
|
communication on electronic mailing lists, source code control systems,
|
||||||
|
and issue tracking systems that are managed by, or on behalf of, the
|
||||||
|
Licensor for the purpose of discussing and improving the Work, but
|
||||||
|
excluding communication that is conspicuously marked or otherwise
|
||||||
|
designated in writing by the copyright owner as "Not a Contribution."
|
||||||
|
|
||||||
|
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||||
|
on behalf of whom a Contribution has been received by Licensor and
|
||||||
|
subsequently incorporated within the Work.
|
||||||
|
|
||||||
|
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
copyright license to reproduce, prepare Derivative Works of,
|
||||||
|
publicly display, publicly perform, sublicense, and distribute the
|
||||||
|
Work and such Derivative Works in Source or Object form.
|
||||||
|
|
||||||
|
3. Grant of Patent License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
(except as stated in this section) patent license to make, have made,
|
||||||
|
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||||
|
where such license applies only to those patent claims licensable
|
||||||
|
by such Contributor that are necessarily infringed by their
|
||||||
|
Contribution(s) alone or by combination of their Contribution(s)
|
||||||
|
with the Work to which such Contribution(s) was submitted. If You
|
||||||
|
institute patent litigation against any entity (including a
|
||||||
|
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||||
|
or a Contribution incorporated within the Work constitutes direct
|
||||||
|
or contributory patent infringement, then any patent licenses
|
||||||
|
granted to You under this License for that Work shall terminate
|
||||||
|
as of the date such litigation is filed.
|
||||||
|
|
||||||
|
4. Redistribution. You may reproduce and distribute copies of the
|
||||||
|
Work or Derivative Works thereof in any medium, with or without
|
||||||
|
modifications, and in Source or Object form, provided that You
|
||||||
|
meet the following conditions:
|
||||||
|
|
||||||
|
(a) You must give any other recipients of the Work or
|
||||||
|
Derivative Works a copy of this License; and
|
||||||
|
|
||||||
|
(b) You must cause any modified files to carry prominent notices
|
||||||
|
stating that You changed the files; and
|
||||||
|
|
||||||
|
(c) You must retain, in the Source form of any Derivative Works
|
||||||
|
that You distribute, all copyright, patent, trademark, and
|
||||||
|
attribution notices from the Source form of the Work,
|
||||||
|
excluding those notices that do not pertain to any part of
|
||||||
|
the Derivative Works; and
|
||||||
|
|
||||||
|
(d) If the Work includes a "NOTICE" text file as part of its
|
||||||
|
distribution, then any Derivative Works that You distribute must
|
||||||
|
include a readable copy of the attribution notices contained
|
||||||
|
within such NOTICE file, excluding those notices that do not
|
||||||
|
pertain to any part of the Derivative Works, in at least one
|
||||||
|
of the following places: within a NOTICE text file distributed
|
||||||
|
as part of the Derivative Works; within the Source form or
|
||||||
|
documentation, if provided along with the Derivative Works; or,
|
||||||
|
within a display generated by the Derivative Works, if and
|
||||||
|
wherever such third-party notices normally appear. The contents
|
||||||
|
of the NOTICE file are for informational purposes only and
|
||||||
|
do not modify the License. You may add Your own attribution
|
||||||
|
notices within Derivative Works that You distribute, alongside
|
||||||
|
or as an addendum to the NOTICE text from the Work, provided
|
||||||
|
that such additional attribution notices cannot be construed
|
||||||
|
as modifying the License.
|
||||||
|
|
||||||
|
You may add Your own copyright statement to Your modifications and
|
||||||
|
may provide additional or different license terms and conditions
|
||||||
|
for use, reproduction, or distribution of Your modifications, or
|
||||||
|
for any such Derivative Works as a whole, provided Your use,
|
||||||
|
reproduction, and distribution of the Work otherwise complies with
|
||||||
|
the conditions stated in this License.
|
||||||
|
|
||||||
|
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||||
|
any Contribution intentionally submitted for inclusion in the Work
|
||||||
|
by You to the Licensor shall be under the terms and conditions of
|
||||||
|
this License, without any additional terms or conditions.
|
||||||
|
Notwithstanding the above, nothing herein shall supersede or modify
|
||||||
|
the terms of any separate license agreement you may have executed
|
||||||
|
with Licensor regarding such Contributions.
|
||||||
|
|
||||||
|
6. Trademarks. This License does not grant permission to use the trade
|
||||||
|
names, trademarks, service marks, or product names of the Licensor,
|
||||||
|
except as required for reasonable and customary use in describing the
|
||||||
|
origin of the Work and reproducing the content of the NOTICE file.
|
||||||
|
|
||||||
|
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||||
|
agreed to in writing, Licensor provides the Work (and each
|
||||||
|
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||||
|
implied, including, without limitation, any warranties or conditions
|
||||||
|
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||||
|
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||||
|
appropriateness of using or redistributing the Work and assume any
|
||||||
|
risks associated with Your exercise of permissions under this License.
|
||||||
|
|
||||||
|
8. Limitation of Liability. In no event and under no legal theory,
|
||||||
|
whether in tort (including negligence), contract, or otherwise,
|
||||||
|
unless required by applicable law (such as deliberate and grossly
|
||||||
|
negligent acts) or agreed to in writing, shall any Contributor be
|
||||||
|
liable to You for damages, including any direct, indirect, special,
|
||||||
|
incidental, or consequential damages of any character arising as a
|
||||||
|
result of this License or out of the use or inability to use the
|
||||||
|
Work (including but not limited to damages for loss of goodwill,
|
||||||
|
work stoppage, computer failure or malfunction, or any and all
|
||||||
|
other commercial damages or losses), even if such Contributor
|
||||||
|
has been advised of the possibility of such damages.
|
||||||
|
|
||||||
|
9. Accepting Warranty or Additional Liability. While redistributing
|
||||||
|
the Work or Derivative Works thereof, You may choose to offer,
|
||||||
|
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||||
|
or other liability obligations and/or rights consistent with this
|
||||||
|
License. However, in accepting such obligations, You may act only
|
||||||
|
on Your own behalf and on Your sole responsibility, not on behalf
|
||||||
|
of any other Contributor, and only if You agree to indemnify,
|
||||||
|
defend, and hold each Contributor harmless for any liability
|
||||||
|
incurred by, or claims asserted against, such Contributor by reason
|
||||||
|
of your accepting any such warranty or additional liability.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
APPENDIX: How to apply the Apache License to your work.
|
||||||
|
|
||||||
|
To apply the Apache License to your work, attach the following
|
||||||
|
boilerplate notice, with the fields enclosed by brackets "{}"
|
||||||
|
replaced with your own identifying information. (Don't include
|
||||||
|
the brackets!) The text should be enclosed in the appropriate
|
||||||
|
comment syntax for the file format. We also recommend that a
|
||||||
|
file or class name and description of purpose be included on the
|
||||||
|
same "printed page" as the copyright notice for easier
|
||||||
|
identification within third-party archives.
|
||||||
|
|
||||||
|
Copyright {yyyy} {name of copyright owner}
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
==============================================================================
|
||||||
|
Gradle Subcomponents:
|
||||||
|
|
||||||
|
------------------------------------------------------------------------------
|
||||||
|
License for the slf4j package
|
||||||
|
------------------------------------------------------------------------------
|
||||||
|
SLF4J License
|
||||||
|
|
||||||
|
Copyright (c) 2004-2007 QOS.ch
|
||||||
|
All rights reserved.
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining
|
||||||
|
a copy of this software and associated documentation files (the
|
||||||
|
"Software"), to deal in the Software without restriction, including
|
||||||
|
without limitation the rights to use, copy, modify, merge, publish,
|
||||||
|
distribute, sublicense, and/or sell copies of the Software, and to
|
||||||
|
permit persons to whom the Software is furnished to do so, subject to
|
||||||
|
the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be
|
||||||
|
included in all copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||||
|
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
|
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||||
|
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||||
|
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
|
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
|
These terms are identical to those of the MIT License, also called the X License or the X11 License,
|
||||||
|
which is a simple, permissive non-copyleft free software license. It is deemed compatible with virtually
|
||||||
|
all types of licenses, commercial or otherwise. In particular, the Free Software Foundation has declared it
|
||||||
|
compatible with GNU GPL. It is also known to be approved by the Apache Software Foundation as compatible
|
||||||
|
with Apache Software License.
|
||||||
|
|
||||||
|
|
||||||
|
------------------------------------------------------------------------------
|
||||||
|
License for the JUnit package
|
||||||
|
------------------------------------------------------------------------------
|
||||||
|
THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
|
||||||
|
LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
|
||||||
|
CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
|
||||||
|
|
||||||
|
1. DEFINITIONS
|
||||||
|
|
||||||
|
"Contribution" means:
|
||||||
|
|
||||||
|
a) in the case of the initial Contributor, the initial code and
|
||||||
|
documentation distributed under this Agreement, and
|
||||||
|
|
||||||
|
b) in the case of each subsequent Contributor:
|
||||||
|
|
||||||
|
i) changes to the Program, and
|
||||||
|
|
||||||
|
ii) additions to the Program;
|
||||||
|
|
||||||
|
where such changes and/or additions to the Program originate from and are
|
||||||
|
distributed by that particular Contributor. A Contribution 'originates' from a
|
||||||
|
Contributor if it was added to the Program by such Contributor itself or anyone
|
||||||
|
acting on such Contributor's behalf. Contributions do not include additions to
|
||||||
|
the Program which: (i) are separate modules of software distributed in
|
||||||
|
conjunction with the Program under their own license agreement, and (ii) are not
|
||||||
|
derivative works of the Program.
|
||||||
|
|
||||||
|
"Contributor" means any person or entity that distributes the Program.
|
||||||
|
|
||||||
|
"Licensed Patents " mean patent claims licensable by a Contributor which are
|
||||||
|
necessarily infringed by the use or sale of its Contribution alone or when
|
||||||
|
combined with the Program.
|
||||||
|
|
||||||
|
"Program" means the Contributions distributed in accordance with this Agreement.
|
||||||
|
|
||||||
|
"Recipient" means anyone who receives the Program under this Agreement,
|
||||||
|
including all Contributors.
|
||||||
|
|
||||||
|
2. GRANT OF RIGHTS
|
||||||
|
|
||||||
|
a) Subject to the terms of this Agreement, each Contributor hereby grants
|
||||||
|
Recipient a non-exclusive, worldwide, royalty-free copyright license to
|
||||||
|
reproduce, prepare derivative works of, publicly display, publicly perform,
|
||||||
|
distribute and sublicense the Contribution of such Contributor, if any, and such
|
||||||
|
derivative works, in source code and object code form.
|
||||||
|
|
||||||
|
b) Subject to the terms of this Agreement, each Contributor hereby grants
|
||||||
|
Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
|
||||||
|
Patents to make, use, sell, offer to sell, import and otherwise transfer the
|
||||||
|
Contribution of such Contributor, if any, in source code and object code form.
|
||||||
|
This patent license shall apply to the combination of the Contribution and the
|
||||||
|
Program if, at the time the Contribution is added by the Contributor, such
|
||||||
|
addition of the Contribution causes such combination to be covered by the
|
||||||
|
Licensed Patents. The patent license shall not apply to any other combinations
|
||||||
|
which include the Contribution. No hardware per se is licensed hereunder.
|
||||||
|
|
||||||
|
c) Recipient understands that although each Contributor grants the licenses
|
||||||
|
to its Contributions set forth herein, no assurances are provided by any
|
||||||
|
Contributor that the Program does not infringe the patent or other intellectual
|
||||||
|
property rights of any other entity. Each Contributor disclaims any liability to
|
||||||
|
Recipient for claims brought by any other entity based on infringement of
|
||||||
|
intellectual property rights or otherwise. As a condition to exercising the
|
||||||
|
rights and licenses granted hereunder, each Recipient hereby assumes sole
|
||||||
|
responsibility to secure any other intellectual property rights needed, if any.
|
||||||
|
For example, if a third party patent license is required to allow Recipient to
|
||||||
|
distribute the Program, it is Recipient's responsibility to acquire that license
|
||||||
|
before distributing the Program.
|
||||||
|
|
||||||
|
d) Each Contributor represents that to its knowledge it has sufficient
|
||||||
|
copyright rights in its Contribution, if any, to grant the copyright license set
|
||||||
|
forth in this Agreement.
|
||||||
|
|
||||||
|
3. REQUIREMENTS
|
||||||
|
|
||||||
|
A Contributor may choose to distribute the Program in object code form under its
|
||||||
|
own license agreement, provided that:
|
||||||
|
|
||||||
|
a) it complies with the terms and conditions of this Agreement; and
|
||||||
|
|
||||||
|
b) its license agreement:
|
||||||
|
|
||||||
|
i) effectively disclaims on behalf of all Contributors all warranties and
|
||||||
|
conditions, express and implied, including warranties or conditions of title and
|
||||||
|
non-infringement, and implied warranties or conditions of merchantability and
|
||||||
|
fitness for a particular purpose;
|
||||||
|
|
||||||
|
ii) effectively excludes on behalf of all Contributors all liability for
|
||||||
|
damages, including direct, indirect, special, incidental and consequential
|
||||||
|
damages, such as lost profits;
|
||||||
|
|
||||||
|
iii) states that any provisions which differ from this Agreement are offered
|
||||||
|
by that Contributor alone and not by any other party; and
|
||||||
|
|
||||||
|
iv) states that source code for the Program is available from such
|
||||||
|
Contributor, and informs licensees how to obtain it in a reasonable manner on or
|
||||||
|
through a medium customarily used for software exchange.
|
||||||
|
|
||||||
|
When the Program is made available in source code form:
|
||||||
|
|
||||||
|
a) it must be made available under this Agreement; and
|
||||||
|
|
||||||
|
b) a copy of this Agreement must be included with each copy of the Program.
|
||||||
|
|
||||||
|
Contributors may not remove or alter any copyright notices contained within the
|
||||||
|
Program.
|
||||||
|
|
||||||
|
Each Contributor must identify itself as the originator of its Contribution, if
|
||||||
|
any, in a manner that reasonably allows subsequent Recipients to identify the
|
||||||
|
originator of the Contribution.
|
||||||
|
|
||||||
|
4. COMMERCIAL DISTRIBUTION
|
||||||
|
|
||||||
|
Commercial distributors of software may accept certain responsibilities with
|
||||||
|
respect to end users, business partners and the like. While this license is
|
||||||
|
intended to facilitate the commercial use of the Program, the Contributor who
|
||||||
|
includes the Program in a commercial product offering should do so in a manner
|
||||||
|
which does not create potential liability for other Contributors. Therefore, if
|
||||||
|
a Contributor includes the Program in a commercial product offering, such
|
||||||
|
Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
|
||||||
|
every other Contributor ("Indemnified Contributor") against any losses, damages
|
||||||
|
and costs (collectively "Losses") arising from claims, lawsuits and other legal
|
||||||
|
actions brought by a third party against the Indemnified Contributor to the
|
||||||
|
extent caused by the acts or omissions of such Commercial Contributor in
|
||||||
|
connection with its distribution of the Program in a commercial product
|
||||||
|
offering. The obligations in this section do not apply to any claims or Losses
|
||||||
|
relating to any actual or alleged intellectual property infringement. In order
|
||||||
|
to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
|
||||||
|
Contributor in writing of such claim, and b) allow the Commercial Contributor to
|
||||||
|
control, and cooperate with the Commercial Contributor in, the defense and any
|
||||||
|
related settlement negotiations. The Indemnified Contributor may participate in
|
||||||
|
any such claim at its own expense.
|
||||||
|
|
||||||
|
For example, a Contributor might include the Program in a commercial product
|
||||||
|
offering, Product X. That Contributor is then a Commercial Contributor. If that
|
||||||
|
Commercial Contributor then makes performance claims, or offers warranties
|
||||||
|
related to Product X, those performance claims and warranties are such
|
||||||
|
Commercial Contributor's responsibility alone. Under this section, the
|
||||||
|
Commercial Contributor would have to defend claims against the other
|
||||||
|
Contributors related to those performance claims and warranties, and if a court
|
||||||
|
requires any other Contributor to pay any damages as a result, the Commercial
|
||||||
|
Contributor must pay those damages.
|
||||||
|
|
||||||
|
5. NO WARRANTY
|
||||||
|
|
||||||
|
EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
|
||||||
|
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
|
||||||
|
IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
|
||||||
|
NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
|
||||||
|
Recipient is solely responsible for determining the appropriateness of using and
|
||||||
|
distributing the Program and assumes all risks associated with its exercise of
|
||||||
|
rights under this Agreement, including but not limited to the risks and costs of
|
||||||
|
program errors, compliance with applicable laws, damage to or loss of data,
|
||||||
|
programs or equipment, and unavailability or interruption of operations.
|
||||||
|
|
||||||
|
6. DISCLAIMER OF LIABILITY
|
||||||
|
|
||||||
|
EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
|
||||||
|
CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
|
||||||
|
PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||||
|
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||||
|
OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
|
||||||
|
GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
|
||||||
|
|
||||||
|
7. GENERAL
|
||||||
|
|
||||||
|
If any provision of this Agreement is invalid or unenforceable under applicable
|
||||||
|
law, it shall not affect the validity or enforceability of the remainder of the
|
||||||
|
terms of this Agreement, and without further action by the parties hereto, such
|
||||||
|
provision shall be reformed to the minimum extent necessary to make such
|
||||||
|
provision valid and enforceable.
|
||||||
|
|
||||||
|
If Recipient institutes patent litigation against a Contributor with respect to
|
||||||
|
a patent applicable to software (including a cross-claim or counterclaim in a
|
||||||
|
lawsuit), then any patent licenses granted by that Contributor to such Recipient
|
||||||
|
under this Agreement shall terminate as of the date such litigation is filed. In
|
||||||
|
addition, if Recipient institutes patent litigation against any entity
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that the Program
|
||||||
|
itself (excluding combinations of the Program with other software or hardware)
|
||||||
|
infringes such Recipient's patent(s), then such Recipient's rights granted under
|
||||||
|
Section 2(b) shall terminate as of the date such litigation is filed.
|
||||||
|
|
||||||
|
All Recipient's rights under this Agreement shall terminate if it fails to
|
||||||
|
comply with any of the material terms or conditions of this Agreement and does
|
||||||
|
not cure such failure in a reasonable period of time after becoming aware of
|
||||||
|
such noncompliance. If all Recipient's rights under this Agreement terminate,
|
||||||
|
Recipient agrees to cease use and distribution of the Program as soon as
|
||||||
|
reasonably practicable. However, Recipient's obligations under this Agreement
|
||||||
|
and any licenses granted by Recipient relating to the Program shall continue and
|
||||||
|
survive.
|
||||||
|
|
||||||
|
Everyone is permitted to copy and distribute copies of this Agreement, but in
|
||||||
|
order to avoid inconsistency the Agreement is copyrighted and may only be
|
||||||
|
modified in the following manner. The Agreement Steward reserves the right to
|
||||||
|
publish new versions (including revisions) of this Agreement from time to time.
|
||||||
|
No one other than the Agreement Steward has the right to modify this Agreement.
|
||||||
|
IBM is the initial Agreement Steward. IBM may assign the responsibility to serve
|
||||||
|
as the Agreement Steward to a suitable separate entity. Each new version of the
|
||||||
|
Agreement will be given a distinguishing version number. The Program (including
|
||||||
|
Contributions) may always be distributed subject to the version of the Agreement
|
||||||
|
under which it was received. In addition, after a new version of the Agreement
|
||||||
|
is published, Contributor may elect to distribute the Program (including its
|
||||||
|
Contributions) under the new version. Except as expressly stated in Sections
|
||||||
|
2(a) and 2(b) above, Recipient receives no rights or licenses to the
|
||||||
|
intellectual property of any Contributor under this Agreement, whether
|
||||||
|
expressly, by implication, estoppel or otherwise. All rights in the Program not
|
||||||
|
expressly granted under this Agreement are reserved.
|
||||||
|
|
||||||
|
This Agreement is governed by the laws of the State of New York and the
|
||||||
|
intellectual property laws of the United States of America. No party to this
|
||||||
|
Agreement will bring a legal action under this Agreement more than one year
|
||||||
|
after the cause of action arose. Each party waives its rights to a jury trial in
|
||||||
|
any resulting litigation.
|
||||||
|
|
||||||
|
------------------------------------------------------------------------------
|
||||||
|
License for the JCIFS package
|
||||||
|
------------------------------------------------------------------------------
|
||||||
|
JCIFS License
|
||||||
|
|
||||||
|
GNU LESSER GENERAL PUBLIC LICENSE
|
||||||
|
Version 2.1, February 1999
|
||||||
|
|
||||||
|
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
|
||||||
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
[This is the first released version of the Lesser GPL. It also counts
|
||||||
|
as the successor of the GNU Library Public License, version 2, hence
|
||||||
|
the version number 2.1.]
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The licenses for most software are designed to take away your
|
||||||
|
freedom to share and change it. By contrast, the GNU General Public
|
||||||
|
Licenses are intended to guarantee your freedom to share and change
|
||||||
|
free software--to make sure the software is free for all its users.
|
||||||
|
|
||||||
|
This license, the Lesser General Public License, applies to some
|
||||||
|
specially designated software packages--typically libraries--of the
|
||||||
|
Free Software Foundation and other authors who decide to use it. You
|
||||||
|
can use it too, but we suggest you first think carefully about whether
|
||||||
|
this license or the ordinary General Public License is the better
|
||||||
|
strategy to use in any particular case, based on the explanations below.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom of use,
|
||||||
|
not price. Our General Public Licenses are designed to make sure that
|
||||||
|
you have the freedom to distribute copies of free software (and charge
|
||||||
|
for this service if you wish); that you receive source code or can get
|
||||||
|
it if you want it; that you can change the software and use pieces of
|
||||||
|
it in new free programs; and that you are informed that you can do
|
||||||
|
these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to make restrictions that forbid
|
||||||
|
distributors to deny you these rights or to ask you to surrender these
|
||||||
|
rights. These restrictions translate to certain responsibilities for
|
||||||
|
you if you distribute copies of the library or if you modify it.
|
||||||
|
|
||||||
|
For example, if you distribute copies of the library, whether gratis
|
||||||
|
or for a fee, you must give the recipients all the rights that we gave
|
||||||
|
you. You must make sure that they, too, receive or can get the source
|
||||||
|
code. If you link other code with the library, you must provide
|
||||||
|
complete object files to the recipients, so that they can relink them
|
||||||
|
with the library after making changes to the library and recompiling
|
||||||
|
it. And you must show them these terms so they know their rights.
|
||||||
|
|
||||||
|
We protect your rights with a two-step method: (1) we copyright the
|
||||||
|
library, and (2) we offer you this license, which gives you legal
|
||||||
|
permission to copy, distribute and/or modify the library.
|
||||||
|
|
||||||
|
To protect each distributor, we want to make it very clear that
|
||||||
|
there is no warranty for the free library. Also, if the library is
|
||||||
|
modified by someone else and passed on, the recipients should know
|
||||||
|
that what they have is not the original version, so that the original
|
||||||
|
author's reputation will not be affected by problems that might be
|
||||||
|
introduced by others.
|
||||||
|
|
||||||
|
Finally, software patents pose a constant threat to the existence of
|
||||||
|
any free program. We wish to make sure that a company cannot
|
||||||
|
effectively restrict the users of a free program by obtaining a
|
||||||
|
restrictive license from a patent holder. Therefore, we insist that
|
||||||
|
any patent license obtained for a version of the library must be
|
||||||
|
consistent with the full freedom of use specified in this license.
|
||||||
|
|
||||||
|
Most GNU software, including some libraries, is covered by the
|
||||||
|
ordinary GNU General Public License. This license, the GNU Lesser
|
||||||
|
General Public License, applies to certain designated libraries, and
|
||||||
|
is quite different from the ordinary General Public License. We use
|
||||||
|
this license for certain libraries in order to permit linking those
|
||||||
|
libraries into non-free programs.
|
||||||
|
|
||||||
|
When a program is linked with a library, whether statically or using
|
||||||
|
a shared library, the combination of the two is legally speaking a
|
||||||
|
combined work, a derivative of the original library. The ordinary
|
||||||
|
General Public License therefore permits such linking only if the
|
||||||
|
entire combination fits its criteria of freedom. The Lesser General
|
||||||
|
Public License permits more lax criteria for linking other code with
|
||||||
|
the library.
|
||||||
|
|
||||||
|
We call this license the "Lesser" General Public License because it
|
||||||
|
does Less to protect the user's freedom than the ordinary General
|
||||||
|
Public License. It also provides other free software developers Less
|
||||||
|
of an advantage over competing non-free programs. These disadvantages
|
||||||
|
are the reason we use the ordinary General Public License for many
|
||||||
|
libraries. However, the Lesser license provides advantages in certain
|
||||||
|
special circumstances.
|
||||||
|
|
||||||
|
For example, on rare occasions, there may be a special need to
|
||||||
|
encourage the widest possible use of a certain library, so that it becomes
|
||||||
|
a de-facto standard. To achieve this, non-free programs must be
|
||||||
|
allowed to use the library. A more frequent case is that a free
|
||||||
|
library does the same job as widely used non-free libraries. In this
|
||||||
|
case, there is little to gain by limiting the free library to free
|
||||||
|
software only, so we use the Lesser General Public License.
|
||||||
|
|
||||||
|
In other cases, permission to use a particular library in non-free
|
||||||
|
programs enables a greater number of people to use a large body of
|
||||||
|
free software. For example, permission to use the GNU C Library in
|
||||||
|
non-free programs enables many more people to use the whole GNU
|
||||||
|
operating system, as well as its variant, the GNU/Linux operating
|
||||||
|
system.
|
||||||
|
|
||||||
|
Although the Lesser General Public License is Less protective of the
|
||||||
|
users' freedom, it does ensure that the user of a program that is
|
||||||
|
linked with the Library has the freedom and the wherewithal to run
|
||||||
|
that program using a modified version of the Library.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow. Pay close attention to the difference between a
|
||||||
|
"work based on the library" and a "work that uses the library". The
|
||||||
|
former contains code derived from the library, whereas the latter must
|
||||||
|
be combined with the library in order to run.
|
||||||
|
|
||||||
|
GNU LESSER GENERAL PUBLIC LICENSE
|
||||||
|
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||||
|
|
||||||
|
0. This License Agreement applies to any software library or other
|
||||||
|
program which contains a notice placed by the copyright holder or
|
||||||
|
other authorized party saying it may be distributed under the terms of
|
||||||
|
this Lesser General Public License (also called "this License").
|
||||||
|
Each licensee is addressed as "you".
|
||||||
|
|
||||||
|
A "library" means a collection of software functions and/or data
|
||||||
|
prepared so as to be conveniently linked with application programs
|
||||||
|
(which use some of those functions and data) to form executables.
|
||||||
|
|
||||||
|
The "Library", below, refers to any such software library or work
|
||||||
|
which has been distributed under these terms. A "work based on the
|
||||||
|
Library" means either the Library or any derivative work under
|
||||||
|
copyright law: that is to say, a work containing the Library or a
|
||||||
|
portion of it, either verbatim or with modifications and/or translated
|
||||||
|
straightforwardly into another language. (Hereinafter, translation is
|
||||||
|
included without limitation in the term "modification".)
|
||||||
|
|
||||||
|
"Source code" for a work means the preferred form of the work for
|
||||||
|
making modifications to it. For a library, complete source code means
|
||||||
|
all the source code for all modules it contains, plus any associated
|
||||||
|
interface definition files, plus the scripts used to control compilation
|
||||||
|
and installation of the library.
|
||||||
|
|
||||||
|
Activities other than copying, distribution and modification are not
|
||||||
|
covered by this License; they are outside its scope. The act of
|
||||||
|
running a program using the Library is not restricted, and output from
|
||||||
|
such a program is covered only if its contents constitute a work based
|
||||||
|
on the Library (independent of the use of the Library in a tool for
|
||||||
|
writing it). Whether that is true depends on what the Library does
|
||||||
|
and what the program that uses the Library does.
|
||||||
|
|
||||||
|
1. You may copy and distribute verbatim copies of the Library's
|
||||||
|
complete source code as you receive it, in any medium, provided that
|
||||||
|
you conspicuously and appropriately publish on each copy an
|
||||||
|
appropriate copyright notice and disclaimer of warranty; keep intact
|
||||||
|
all the notices that refer to this License and to the absence of any
|
||||||
|
warranty; and distribute a copy of this License along with the
|
||||||
|
Library.
|
||||||
|
|
||||||
|
You may charge a fee for the physical act of transferring a copy,
|
||||||
|
and you may at your option offer warranty protection in exchange for a
|
||||||
|
fee.
|
||||||
|
|
||||||
|
2. You may modify your copy or copies of the Library or any portion
|
||||||
|
of it, thus forming a work based on the Library, and copy and
|
||||||
|
distribute such modifications or work under the terms of Section 1
|
||||||
|
above, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The modified work must itself be a software library.
|
||||||
|
|
||||||
|
b) You must cause the files modified to carry prominent notices
|
||||||
|
stating that you changed the files and the date of any change.
|
||||||
|
|
||||||
|
c) You must cause the whole of the work to be licensed at no
|
||||||
|
charge to all third parties under the terms of this License.
|
||||||
|
|
||||||
|
d) If a facility in the modified Library refers to a function or a
|
||||||
|
table of data to be supplied by an application program that uses
|
||||||
|
the facility, other than as an argument passed when the facility
|
||||||
|
is invoked, then you must make a good faith effort to ensure that,
|
||||||
|
in the event an application does not supply such function or
|
||||||
|
table, the facility still operates, and performs whatever part of
|
||||||
|
its purpose remains meaningful.
|
||||||
|
|
||||||
|
(For example, a function in a library to compute square roots has
|
||||||
|
a purpose that is entirely well-defined independent of the
|
||||||
|
application. Therefore, Subsection 2d requires that any
|
||||||
|
application-supplied function or table used by this function must
|
||||||
|
be optional: if the application does not supply it, the square
|
||||||
|
root function must still compute square roots.)
|
||||||
|
|
||||||
|
These requirements apply to the modified work as a whole. If
|
||||||
|
identifiable sections of that work are not derived from the Library,
|
||||||
|
and can be reasonably considered independent and separate works in
|
||||||
|
themselves, then this License, and its terms, do not apply to those
|
||||||
|
sections when you distribute them as separate works. But when you
|
||||||
|
distribute the same sections as part of a whole which is a work based
|
||||||
|
on the Library, the distribution of the whole must be on the terms of
|
||||||
|
this License, whose permissions for other licensees extend to the
|
||||||
|
entire whole, and thus to each and every part regardless of who wrote
|
||||||
|
it.
|
||||||
|
|
||||||
|
Thus, it is not the intent of this section to claim rights or contest
|
||||||
|
your rights to work written entirely by you; rather, the intent is to
|
||||||
|
exercise the right to control the distribution of derivative or
|
||||||
|
collective works based on the Library.
|
||||||
|
|
||||||
|
In addition, mere aggregation of another work not based on the Library
|
||||||
|
with the Library (or with a work based on the Library) on a volume of
|
||||||
|
a storage or distribution medium does not bring the other work under
|
||||||
|
the scope of this License.
|
||||||
|
|
||||||
|
3. You may opt to apply the terms of the ordinary GNU General Public
|
||||||
|
License instead of this License to a given copy of the Library. To do
|
||||||
|
this, you must alter all the notices that refer to this License, so
|
||||||
|
that they refer to the ordinary GNU General Public License, version 2,
|
||||||
|
instead of to this License. (If a newer version than version 2 of the
|
||||||
|
ordinary GNU General Public License has appeared, then you can specify
|
||||||
|
that version instead if you wish.) Do not make any other change in
|
||||||
|
these notices.
|
||||||
|
|
||||||
|
Once this change is made in a given copy, it is irreversible for
|
||||||
|
that copy, so the ordinary GNU General Public License applies to all
|
||||||
|
subsequent copies and derivative works made from that copy.
|
||||||
|
|
||||||
|
This option is useful when you wish to copy part of the code of
|
||||||
|
the Library into a program that is not a library.
|
||||||
|
|
||||||
|
4. You may copy and distribute the Library (or a portion or
|
||||||
|
derivative of it, under Section 2) in object code or executable form
|
||||||
|
under the terms of Sections 1 and 2 above provided that you accompany
|
||||||
|
it with the complete corresponding machine-readable source code, which
|
||||||
|
must be distributed under the terms of Sections 1 and 2 above on a
|
||||||
|
medium customarily used for software interchange.
|
||||||
|
|
||||||
|
If distribution of object code is made by offering access to copy
|
||||||
|
from a designated place, then offering equivalent access to copy the
|
||||||
|
source code from the same place satisfies the requirement to
|
||||||
|
distribute the source code, even though third parties are not
|
||||||
|
compelled to copy the source along with the object code.
|
||||||
|
|
||||||
|
5. A program that contains no derivative of any portion of the
|
||||||
|
Library, but is designed to work with the Library by being compiled or
|
||||||
|
linked with it, is called a "work that uses the Library". Such a
|
||||||
|
work, in isolation, is not a derivative work of the Library, and
|
||||||
|
therefore falls outside the scope of this License.
|
||||||
|
|
||||||
|
However, linking a "work that uses the Library" with the Library
|
||||||
|
creates an executable that is a derivative of the Library (because it
|
||||||
|
contains portions of the Library), rather than a "work that uses the
|
||||||
|
library". The executable is therefore covered by this License.
|
||||||
|
Section 6 states terms for distribution of such executables.
|
||||||
|
|
||||||
|
When a "work that uses the Library" uses material from a header file
|
||||||
|
that is part of the Library, the object code for the work may be a
|
||||||
|
derivative work of the Library even though the source code is not.
|
||||||
|
Whether this is true is especially significant if the work can be
|
||||||
|
linked without the Library, or if the work is itself a library. The
|
||||||
|
threshold for this to be true is not precisely defined by law.
|
||||||
|
|
||||||
|
If such an object file uses only numerical parameters, data
|
||||||
|
structure layouts and accessors, and small macros and small inline
|
||||||
|
functions (ten lines or less in length), then the use of the object
|
||||||
|
file is unrestricted, regardless of whether it is legally a derivative
|
||||||
|
work. (Executables containing this object code plus portions of the
|
||||||
|
Library will still fall under Section 6.)
|
||||||
|
|
||||||
|
Otherwise, if the work is a derivative of the Library, you may
|
||||||
|
distribute the object code for the work under the terms of Section 6.
|
||||||
|
Any executables containing that work also fall under Section 6,
|
||||||
|
whether or not they are linked directly with the Library itself.
|
||||||
|
|
||||||
|
6. As an exception to the Sections above, you may also combine or
|
||||||
|
link a "work that uses the Library" with the Library to produce a
|
||||||
|
work containing portions of the Library, and distribute that work
|
||||||
|
under terms of your choice, provided that the terms permit
|
||||||
|
modification of the work for the customer's own use and reverse
|
||||||
|
engineering for debugging such modifications.
|
||||||
|
|
||||||
|
You must give prominent notice with each copy of the work that the
|
||||||
|
Library is used in it and that the Library and its use are covered by
|
||||||
|
this License. You must supply a copy of this License. If the work
|
||||||
|
during execution displays copyright notices, you must include the
|
||||||
|
copyright notice for the Library among them, as well as a reference
|
||||||
|
directing the user to the copy of this License. Also, you must do one
|
||||||
|
of these things:
|
||||||
|
|
||||||
|
a) Accompany the work with the complete corresponding
|
||||||
|
machine-readable source code for the Library including whatever
|
||||||
|
changes were used in the work (which must be distributed under
|
||||||
|
Sections 1 and 2 above); and, if the work is an executable linked
|
||||||
|
with the Library, with the complete machine-readable "work that
|
||||||
|
uses the Library", as object code and/or source code, so that the
|
||||||
|
user can modify the Library and then relink to produce a modified
|
||||||
|
executable containing the modified Library. (It is understood
|
||||||
|
that the user who changes the contents of definitions files in the
|
||||||
|
Library will not necessarily be able to recompile the application
|
||||||
|
to use the modified definitions.)
|
||||||
|
|
||||||
|
b) Use a suitable shared library mechanism for linking with the
|
||||||
|
Library. A suitable mechanism is one that (1) uses at run time a
|
||||||
|
copy of the library already present on the user's computer system,
|
||||||
|
rather than copying library functions into the executable, and (2)
|
||||||
|
will operate properly with a modified version of the library, if
|
||||||
|
the user installs one, as long as the modified version is
|
||||||
|
interface-compatible with the version that the work was made with.
|
||||||
|
|
||||||
|
c) Accompany the work with a written offer, valid for at
|
||||||
|
least three years, to give the same user the materials
|
||||||
|
specified in Subsection 6a, above, for a charge no more
|
||||||
|
than the cost of performing this distribution.
|
||||||
|
|
||||||
|
d) If distribution of the work is made by offering access to copy
|
||||||
|
from a designated place, offer equivalent access to copy the above
|
||||||
|
specified materials from the same place.
|
||||||
|
|
||||||
|
e) Verify that the user has already received a copy of these
|
||||||
|
materials or that you have already sent this user a copy.
|
||||||
|
|
||||||
|
For an executable, the required form of the "work that uses the
|
||||||
|
Library" must include any data and utility programs needed for
|
||||||
|
reproducing the executable from it. However, as a special exception,
|
||||||
|
the materials to be distributed need not include anything that is
|
||||||
|
normally distributed (in either source or binary form) with the major
|
||||||
|
components (compiler, kernel, and so on) of the operating system on
|
||||||
|
which the executable runs, unless that component itself accompanies
|
||||||
|
the executable.
|
||||||
|
|
||||||
|
It may happen that this requirement contradicts the license
|
||||||
|
restrictions of other proprietary libraries that do not normally
|
||||||
|
accompany the operating system. Such a contradiction means you cannot
|
||||||
|
use both them and the Library together in an executable that you
|
||||||
|
distribute.
|
||||||
|
|
||||||
|
7. You may place library facilities that are a work based on the
|
||||||
|
Library side-by-side in a single library together with other library
|
||||||
|
facilities not covered by this License, and distribute such a combined
|
||||||
|
library, provided that the separate distribution of the work based on
|
||||||
|
the Library and of the other library facilities is otherwise
|
||||||
|
permitted, and provided that you do these two things:
|
||||||
|
|
||||||
|
a) Accompany the combined library with a copy of the same work
|
||||||
|
based on the Library, uncombined with any other library
|
||||||
|
facilities. This must be distributed under the terms of the
|
||||||
|
Sections above.
|
||||||
|
|
||||||
|
b) Give prominent notice with the combined library of the fact
|
||||||
|
that part of it is a work based on the Library, and explaining
|
||||||
|
where to find the accompanying uncombined form of the same work.
|
||||||
|
|
||||||
|
8. You may not copy, modify, sublicense, link with, or distribute
|
||||||
|
the Library except as expressly provided under this License. Any
|
||||||
|
attempt otherwise to copy, modify, sublicense, link with, or
|
||||||
|
distribute the Library is void, and will automatically terminate your
|
||||||
|
rights under this License. However, parties who have received copies,
|
||||||
|
or rights, from you under this License will not have their licenses
|
||||||
|
terminated so long as such parties remain in full compliance.
|
||||||
|
|
||||||
|
9. You are not required to accept this License, since you have not
|
||||||
|
signed it. However, nothing else grants you permission to modify or
|
||||||
|
distribute the Library or its derivative works. These actions are
|
||||||
|
prohibited by law if you do not accept this License. Therefore, by
|
||||||
|
modifying or distributing the Library (or any work based on the
|
||||||
|
Library), you indicate your acceptance of this License to do so, and
|
||||||
|
all its terms and conditions for copying, distributing or modifying
|
||||||
|
the Library or works based on it.
|
||||||
|
|
||||||
|
10. Each time you redistribute the Library (or any work based on the
|
||||||
|
Library), the recipient automatically receives a license from the
|
||||||
|
original licensor to copy, distribute, link with or modify the Library
|
||||||
|
subject to these terms and conditions. You may not impose any further
|
||||||
|
restrictions on the recipients' exercise of the rights granted herein.
|
||||||
|
You are not responsible for enforcing compliance by third parties with
|
||||||
|
this License.
|
||||||
|
|
||||||
|
11. If, as a consequence of a court judgment or allegation of patent
|
||||||
|
infringement or for any other reason (not limited to patent issues),
|
||||||
|
conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot
|
||||||
|
distribute so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you
|
||||||
|
may not distribute the Library at all. For example, if a patent
|
||||||
|
license would not permit royalty-free redistribution of the Library by
|
||||||
|
all those who receive copies directly or indirectly through you, then
|
||||||
|
the only way you could satisfy both it and this License would be to
|
||||||
|
refrain entirely from distribution of the Library.
|
||||||
|
|
||||||
|
If any portion of this section is held invalid or unenforceable under any
|
||||||
|
particular circumstance, the balance of the section is intended to apply,
|
||||||
|
and the section as a whole is intended to apply in other circumstances.
|
||||||
|
|
||||||
|
It is not the purpose of this section to induce you to infringe any
|
||||||
|
patents or other property right claims or to contest validity of any
|
||||||
|
such claims; this section has the sole purpose of protecting the
|
||||||
|
integrity of the free software distribution system which is
|
||||||
|
implemented by public license practices. Many people have made
|
||||||
|
generous contributions to the wide range of software distributed
|
||||||
|
through that system in reliance on consistent application of that
|
||||||
|
system; it is up to the author/donor to decide if he or she is willing
|
||||||
|
to distribute software through any other system and a licensee cannot
|
||||||
|
impose that choice.
|
||||||
|
|
||||||
|
This section is intended to make thoroughly clear what is believed to
|
||||||
|
be a consequence of the rest of this License.
|
||||||
|
|
||||||
|
12. If the distribution and/or use of the Library is restricted in
|
||||||
|
certain countries either by patents or by copyrighted interfaces, the
|
||||||
|
original copyright holder who places the Library under this License may add
|
||||||
|
an explicit geographical distribution limitation excluding those countries,
|
||||||
|
so that distribution is permitted only in or among countries not thus
|
||||||
|
excluded. In such case, this License incorporates the limitation as if
|
||||||
|
written in the body of this License.
|
||||||
|
|
||||||
|
13. The Free Software Foundation may publish revised and/or new
|
||||||
|
versions of the Lesser General Public License from time to time.
|
||||||
|
Such new versions will be similar in spirit to the present version,
|
||||||
|
but may differ in detail to address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the Library
|
||||||
|
specifies a version number of this License which applies to it and
|
||||||
|
"any later version", you have the option of following the terms and
|
||||||
|
conditions either of that version or of any later version published by
|
||||||
|
the Free Software Foundation. If the Library does not specify a
|
||||||
|
license version number, you may choose any version ever published by
|
||||||
|
the Free Software Foundation.
|
||||||
|
|
||||||
|
14. If you wish to incorporate parts of the Library into other free
|
||||||
|
programs whose distribution conditions are incompatible with these,
|
||||||
|
write to the author to ask for permission. For software which is
|
||||||
|
copyrighted by the Free Software Foundation, write to the Free
|
||||||
|
Software Foundation; we sometimes make exceptions for this. Our
|
||||||
|
decision will be guided by the two goals of preserving the free status
|
||||||
|
of all derivatives of our free software and of promoting the sharing
|
||||||
|
and reuse of software generally.
|
||||||
|
|
||||||
|
NO WARRANTY
|
||||||
|
|
||||||
|
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
|
||||||
|
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
|
||||||
|
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
|
||||||
|
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
|
||||||
|
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
|
||||||
|
LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
|
||||||
|
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
|
||||||
|
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
|
||||||
|
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
|
||||||
|
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
|
||||||
|
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
|
||||||
|
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
|
||||||
|
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
|
||||||
|
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
|
||||||
|
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
|
||||||
|
DAMAGES.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Libraries
|
||||||
|
|
||||||
|
If you develop a new library, and you want it to be of the greatest
|
||||||
|
possible use to the public, we recommend making it free software that
|
||||||
|
everyone can redistribute and change. You can do so by permitting
|
||||||
|
redistribution under these terms (or, alternatively, under the terms of the
|
||||||
|
ordinary General Public License).
|
||||||
|
|
||||||
|
To apply these terms, attach the following notices to the library. It is
|
||||||
|
safest to attach them to the start of each source file to most effectively
|
||||||
|
convey the exclusion of warranty; and each file should have at least the
|
||||||
|
"copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the library's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This library is free software; you can redistribute it and/or
|
||||||
|
modify it under the terms of the GNU Lesser General Public
|
||||||
|
License as published by the Free Software Foundation; either
|
||||||
|
version 2.1 of the License, or (at your option) any later version.
|
||||||
|
|
||||||
|
This library is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
Lesser General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Lesser General Public
|
||||||
|
License along with this library; if not, write to the Free Software
|
||||||
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or your
|
||||||
|
school, if any, to sign a "copyright disclaimer" for the library, if
|
||||||
|
necessary. Here is a sample; alter the names:
|
||||||
|
|
||||||
|
Yoyodyne, Inc., hereby disclaims all copyright interest in the
|
||||||
|
library `Frob' (a library for tweaking knobs) written by James Random Hacker.
|
||||||
|
|
||||||
|
<signature of Ty Coon>, 1 April 1990
|
||||||
|
Ty Coon, President of Vice
|
||||||
|
|
||||||
|
That's all there is to it!
|
||||||
|
|
||||||
23
src/3rdparty/gradle/gradle.pro
vendored
Normal file
23
src/3rdparty/gradle/gradle.pro
vendored
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
CONFIG -= qt android_install
|
||||||
|
|
||||||
|
gradle.files = \
|
||||||
|
$$PWD/gradlew \
|
||||||
|
$$PWD/gradlew.bat \
|
||||||
|
$$PWD/gradle
|
||||||
|
|
||||||
|
gradle.path = $$[QT_INSTALL_PREFIX]/src/3rdparty/gradle
|
||||||
|
|
||||||
|
INSTALLS += gradle
|
||||||
|
|
||||||
|
!prefix_build:!equals(OUT_PWD, $$PWD) {
|
||||||
|
RETURN = $$escape_expand(\\n\\t)
|
||||||
|
equals(QMAKE_HOST.os, Windows) {
|
||||||
|
RETURN = $$escape_expand(\\r\\n\\t)
|
||||||
|
}
|
||||||
|
OUT_PATH = $$shell_path($$OUT_PWD)
|
||||||
|
|
||||||
|
QMAKE_POST_LINK += \
|
||||||
|
$${QMAKE_COPY} $$shell_path($$PWD/gradlew) $$OUT_PATH $$RETURN \
|
||||||
|
$${QMAKE_COPY} $$shell_path($$PWD/gradlew.bat) $$OUT_PATH $$RETURN \
|
||||||
|
$${QMAKE_COPY_DIR} $$shell_path($$PWD/gradle) $$OUT_PATH
|
||||||
|
}
|
||||||
BIN
src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
BIN
src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
Binary file not shown.
6
src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
6
src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
#Mon Feb 20 10:43:22 EST 2017
|
||||||
|
distributionBase=GRADLE_USER_HOME
|
||||||
|
distributionPath=wrapper/dists
|
||||||
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
zipStorePath=wrapper/dists
|
||||||
|
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-bin.zip
|
||||||
172
src/3rdparty/gradle/gradlew
vendored
Executable file
172
src/3rdparty/gradle/gradlew
vendored
Executable file
@ -0,0 +1,172 @@
|
|||||||
|
#!/usr/bin/env sh
|
||||||
|
|
||||||
|
##############################################################################
|
||||||
|
##
|
||||||
|
## Gradle start up script for UN*X
|
||||||
|
##
|
||||||
|
##############################################################################
|
||||||
|
|
||||||
|
# Attempt to set APP_HOME
|
||||||
|
# Resolve links: $0 may be a link
|
||||||
|
PRG="$0"
|
||||||
|
# Need this for relative symlinks.
|
||||||
|
while [ -h "$PRG" ] ; do
|
||||||
|
ls=`ls -ld "$PRG"`
|
||||||
|
link=`expr "$ls" : '.*-> \(.*\)$'`
|
||||||
|
if expr "$link" : '/.*' > /dev/null; then
|
||||||
|
PRG="$link"
|
||||||
|
else
|
||||||
|
PRG=`dirname "$PRG"`"/$link"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
SAVED="`pwd`"
|
||||||
|
cd "`dirname \"$PRG\"`/" >/dev/null
|
||||||
|
APP_HOME="`pwd -P`"
|
||||||
|
cd "$SAVED" >/dev/null
|
||||||
|
|
||||||
|
APP_NAME="Gradle"
|
||||||
|
APP_BASE_NAME=`basename "$0"`
|
||||||
|
|
||||||
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
|
DEFAULT_JVM_OPTS="-Xmx1024m -Dfile.encoding=UTF-8"
|
||||||
|
|
||||||
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
|
MAX_FD="maximum"
|
||||||
|
|
||||||
|
warn ( ) {
|
||||||
|
echo "$*"
|
||||||
|
}
|
||||||
|
|
||||||
|
die ( ) {
|
||||||
|
echo
|
||||||
|
echo "$*"
|
||||||
|
echo
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# OS specific support (must be 'true' or 'false').
|
||||||
|
cygwin=false
|
||||||
|
msys=false
|
||||||
|
darwin=false
|
||||||
|
nonstop=false
|
||||||
|
case "`uname`" in
|
||||||
|
CYGWIN* )
|
||||||
|
cygwin=true
|
||||||
|
;;
|
||||||
|
Darwin* )
|
||||||
|
darwin=true
|
||||||
|
;;
|
||||||
|
MINGW* )
|
||||||
|
msys=true
|
||||||
|
;;
|
||||||
|
NONSTOP* )
|
||||||
|
nonstop=true
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||||
|
|
||||||
|
# Determine the Java command to use to start the JVM.
|
||||||
|
if [ -n "$JAVA_HOME" ] ; then
|
||||||
|
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||||
|
# IBM's JDK on AIX uses strange locations for the executables
|
||||||
|
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||||
|
else
|
||||||
|
JAVACMD="$JAVA_HOME/bin/java"
|
||||||
|
fi
|
||||||
|
if [ ! -x "$JAVACMD" ] ; then
|
||||||
|
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||||
|
|
||||||
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
location of your Java installation."
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
JAVACMD="java"
|
||||||
|
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
|
||||||
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
location of your Java installation."
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Increase the maximum file descriptors if we can.
|
||||||
|
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
||||||
|
MAX_FD_LIMIT=`ulimit -H -n`
|
||||||
|
if [ $? -eq 0 ] ; then
|
||||||
|
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
||||||
|
MAX_FD="$MAX_FD_LIMIT"
|
||||||
|
fi
|
||||||
|
ulimit -n $MAX_FD
|
||||||
|
if [ $? -ne 0 ] ; then
|
||||||
|
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# For Darwin, add options to specify how the application appears in the dock
|
||||||
|
if $darwin; then
|
||||||
|
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
||||||
|
fi
|
||||||
|
|
||||||
|
# For Cygwin, switch paths to Windows format before running java
|
||||||
|
if $cygwin ; then
|
||||||
|
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||||
|
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||||
|
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||||
|
|
||||||
|
# We build the pattern for arguments to be converted via cygpath
|
||||||
|
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
||||||
|
SEP=""
|
||||||
|
for dir in $ROOTDIRSRAW ; do
|
||||||
|
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
||||||
|
SEP="|"
|
||||||
|
done
|
||||||
|
OURCYGPATTERN="(^($ROOTDIRS))"
|
||||||
|
# Add a user-defined pattern to the cygpath arguments
|
||||||
|
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
||||||
|
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
||||||
|
fi
|
||||||
|
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||||
|
i=0
|
||||||
|
for arg in "$@" ; do
|
||||||
|
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
||||||
|
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
||||||
|
|
||||||
|
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
||||||
|
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
||||||
|
else
|
||||||
|
eval `echo args$i`="\"$arg\""
|
||||||
|
fi
|
||||||
|
i=$((i+1))
|
||||||
|
done
|
||||||
|
case $i in
|
||||||
|
(0) set -- ;;
|
||||||
|
(1) set -- "$args0" ;;
|
||||||
|
(2) set -- "$args0" "$args1" ;;
|
||||||
|
(3) set -- "$args0" "$args1" "$args2" ;;
|
||||||
|
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
||||||
|
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
||||||
|
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
||||||
|
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
||||||
|
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
||||||
|
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Escape application args
|
||||||
|
save ( ) {
|
||||||
|
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
||||||
|
echo " "
|
||||||
|
}
|
||||||
|
APP_ARGS=$(save "$@")
|
||||||
|
|
||||||
|
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
||||||
|
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
||||||
|
|
||||||
|
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
|
||||||
|
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
|
||||||
|
cd "$(dirname "$0")"
|
||||||
|
fi
|
||||||
|
|
||||||
|
exec "$JAVACMD" "$@"
|
||||||
84
src/3rdparty/gradle/gradlew.bat
vendored
Normal file
84
src/3rdparty/gradle/gradlew.bat
vendored
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
@if "%DEBUG%" == "" @echo off
|
||||||
|
@rem ##########################################################################
|
||||||
|
@rem
|
||||||
|
@rem Gradle startup script for Windows
|
||||||
|
@rem
|
||||||
|
@rem ##########################################################################
|
||||||
|
|
||||||
|
@rem Set local scope for the variables with windows NT shell
|
||||||
|
if "%OS%"=="Windows_NT" setlocal
|
||||||
|
|
||||||
|
set DIRNAME=%~dp0
|
||||||
|
if "%DIRNAME%" == "" set DIRNAME=.
|
||||||
|
set APP_BASE_NAME=%~n0
|
||||||
|
set APP_HOME=%DIRNAME%
|
||||||
|
|
||||||
|
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
|
set DEFAULT_JVM_OPTS=-Xmx1024m -Dfile.encoding=UTF-8
|
||||||
|
|
||||||
|
@rem Find java.exe
|
||||||
|
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||||
|
|
||||||
|
set JAVA_EXE=java.exe
|
||||||
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
|
if "%ERRORLEVEL%" == "0" goto init
|
||||||
|
|
||||||
|
echo.
|
||||||
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
echo.
|
||||||
|
echo Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
echo location of your Java installation.
|
||||||
|
|
||||||
|
goto fail
|
||||||
|
|
||||||
|
:findJavaFromJavaHome
|
||||||
|
set JAVA_HOME=%JAVA_HOME:"=%
|
||||||
|
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||||
|
|
||||||
|
if exist "%JAVA_EXE%" goto init
|
||||||
|
|
||||||
|
echo.
|
||||||
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||||
|
echo.
|
||||||
|
echo Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
echo location of your Java installation.
|
||||||
|
|
||||||
|
goto fail
|
||||||
|
|
||||||
|
:init
|
||||||
|
@rem Get command-line arguments, handling Windows variants
|
||||||
|
|
||||||
|
if not "%OS%" == "Windows_NT" goto win9xME_args
|
||||||
|
|
||||||
|
:win9xME_args
|
||||||
|
@rem Slurp the command line arguments.
|
||||||
|
set CMD_LINE_ARGS=
|
||||||
|
set _SKIP=2
|
||||||
|
|
||||||
|
:win9xME_args_slurp
|
||||||
|
if "x%~1" == "x" goto execute
|
||||||
|
|
||||||
|
set CMD_LINE_ARGS=%*
|
||||||
|
|
||||||
|
:execute
|
||||||
|
@rem Setup the command line
|
||||||
|
|
||||||
|
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||||
|
|
||||||
|
@rem Execute Gradle
|
||||||
|
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
|
||||||
|
|
||||||
|
:end
|
||||||
|
@rem End local scope for the variables with windows NT shell
|
||||||
|
if "%ERRORLEVEL%"=="0" goto mainEnd
|
||||||
|
|
||||||
|
:fail
|
||||||
|
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||||
|
rem the _cmd.exe /c_ return code!
|
||||||
|
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||||
|
exit /b 1
|
||||||
|
|
||||||
|
:mainEnd
|
||||||
|
if "%OS%"=="Windows_NT" endlocal
|
||||||
|
|
||||||
|
:omega
|
||||||
13
src/3rdparty/gradle/qt_attribution.json
vendored
Normal file
13
src/3rdparty/gradle/qt_attribution.json
vendored
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
{
|
||||||
|
"Id": "android-gradle-wrapper",
|
||||||
|
"Name": "Gradle wrapper",
|
||||||
|
"Homepage": "https://gradle.org",
|
||||||
|
"Version": "3.4.1",
|
||||||
|
"DownloadLocation": "https://github.com/gradle/gradle/releases/tag/v3.4.1",
|
||||||
|
"QtUsage": "Needed to create Android packages",
|
||||||
|
|
||||||
|
"License": "Apache License 2.0",
|
||||||
|
"LicenseId": "Apache-2.0",
|
||||||
|
"LicenseFile": "LICENSE-GRADLEW.txt",
|
||||||
|
"Copyright": "Copyright (C) 2017 Gradle Inc."
|
||||||
|
}
|
||||||
@ -4,7 +4,7 @@ buildscript {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:1.1.0'
|
classpath 'com.android.tools.build:gradle:2.2.0'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1163,8 +1163,8 @@
|
|||||||
and Windows) the window will take a modified appearance. This flag is set
|
and Windows) the window will take a modified appearance. This flag is set
|
||||||
or cleared by QWidget::setWindowModified().
|
or cleared by QWidget::setWindowModified().
|
||||||
|
|
||||||
\value WA_WindowPropagation Makes a toplevel window inherit font and
|
\value WA_WindowPropagation Makes a toplevel window inherit font, palette
|
||||||
palette from its parent.
|
and locale from its parent.
|
||||||
|
|
||||||
\value WA_MacAlwaysShowToolWindow On \macos, show the tool window even
|
\value WA_MacAlwaysShowToolWindow On \macos, show the tool window even
|
||||||
when the application is not active. By default, all tool windows are
|
when the application is not active. By default, all tool windows are
|
||||||
|
|||||||
@ -117,7 +117,7 @@ QString QStandardPaths::writableLocation(StandardLocation type)
|
|||||||
}
|
}
|
||||||
case RuntimeLocation:
|
case RuntimeLocation:
|
||||||
{
|
{
|
||||||
const uid_t myUid = geteuid();
|
const uint myUid = uint(geteuid());
|
||||||
// http://standards.freedesktop.org/basedir-spec/latest/
|
// http://standards.freedesktop.org/basedir-spec/latest/
|
||||||
QFileInfo fileInfo;
|
QFileInfo fileInfo;
|
||||||
QString xdgRuntimeDir = QFile::decodeName(qgetenv("XDG_RUNTIME_DIR"));
|
QString xdgRuntimeDir = QFile::decodeName(qgetenv("XDG_RUNTIME_DIR"));
|
||||||
|
|||||||
@ -38,6 +38,7 @@
|
|||||||
**
|
**
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
|
#include <cmath>
|
||||||
#include <qlocale.h>
|
#include <qlocale.h>
|
||||||
#include "qjsonwriter_p.h"
|
#include "qjsonwriter_p.h"
|
||||||
#include "qjson_p.h"
|
#include "qjson_p.h"
|
||||||
@ -129,10 +130,12 @@ static void valueToJson(const QJsonPrivate::Base *b, const QJsonPrivate::Value &
|
|||||||
break;
|
break;
|
||||||
case QJsonValue::Double: {
|
case QJsonValue::Double: {
|
||||||
const double d = v.toDouble(b);
|
const double d = v.toDouble(b);
|
||||||
if (qIsFinite(d)) // +2 to format to ensure the expected precision
|
if (qIsFinite(d)) { // +2 to format to ensure the expected precision
|
||||||
json += QByteArray::number(d, 'g', QLocale::FloatingPointShortest);
|
const double abs = std::abs(d);
|
||||||
else
|
json += QByteArray::number(d, abs == static_cast<quint64>(abs) ? 'f' : 'g', QLocale::FloatingPointShortest);
|
||||||
|
} else {
|
||||||
json += "null"; // +INF || -INF || NaN (see RFC4627#section2.4)
|
json += "null"; // +INF || -INF || NaN (see RFC4627#section2.4)
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case QJsonValue::String:
|
case QJsonValue::String:
|
||||||
|
|||||||
@ -361,6 +361,7 @@ Q_OUTOFLINE_TEMPLATE void QVarLengthArray<T, Prealloc>::realloc(int asize, int a
|
|||||||
int osize = s;
|
int osize = s;
|
||||||
|
|
||||||
const int copySize = qMin(asize, osize);
|
const int copySize = qMin(asize, osize);
|
||||||
|
Q_ASSUME(copySize >= 0);
|
||||||
if (aalloc != a) {
|
if (aalloc != a) {
|
||||||
if (aalloc > Prealloc) {
|
if (aalloc > Prealloc) {
|
||||||
T* newPtr = reinterpret_cast<T *>(malloc(aalloc * sizeof(T)));
|
T* newPtr = reinterpret_cast<T *>(malloc(aalloc * sizeof(T)));
|
||||||
|
|||||||
@ -163,7 +163,9 @@
|
|||||||
{ "libs": "-llibpng", "condition": "config.msvc" },
|
{ "libs": "-llibpng", "condition": "config.msvc" },
|
||||||
{ "libs": "-lpng", "condition": "!config.msvc" }
|
{ "libs": "-lpng", "condition": "!config.msvc" }
|
||||||
],
|
],
|
||||||
"use": "zlib"
|
"use": [
|
||||||
|
{ "lib": "zlib", "condition": "features.system-zlib" }
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"mirclient": {
|
"mirclient": {
|
||||||
"label": "Mir client libraries",
|
"label": "Mir client libraries",
|
||||||
@ -689,6 +691,7 @@
|
|||||||
"label": " Using system libpng",
|
"label": " Using system libpng",
|
||||||
"disable": "input.libpng == 'qt'",
|
"disable": "input.libpng == 'qt'",
|
||||||
"enable": "input.libpng == 'system'",
|
"enable": "input.libpng == 'system'",
|
||||||
|
"autoDetect": "features.system-zlib",
|
||||||
"condition": "features.png && libs.libpng",
|
"condition": "features.png && libs.libpng",
|
||||||
"output": [ "privateFeature" ]
|
"output": [ "privateFeature" ]
|
||||||
},
|
},
|
||||||
|
|||||||
@ -291,6 +291,7 @@ static bool convert(const QVariant::Private *d, int t,
|
|||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#ifndef QT_NO_ICON
|
#ifndef QT_NO_ICON
|
||||||
|
|||||||
@ -326,6 +326,7 @@
|
|||||||
#include <QtCore/qdebug.h>
|
#include <QtCore/qdebug.h>
|
||||||
#include <QtCore/qdir.h>
|
#include <QtCore/qdir.h>
|
||||||
#include <QtCore/qmutex.h>
|
#include <QtCore/qmutex.h>
|
||||||
|
#include <QtCore/qurl.h>
|
||||||
#include <QtCore/qelapsedtimer.h>
|
#include <QtCore/qelapsedtimer.h>
|
||||||
#include <QtNetwork/qhostaddress.h>
|
#include <QtNetwork/qhostaddress.h>
|
||||||
#include <QtNetwork/qhostinfo.h>
|
#include <QtNetwork/qhostinfo.h>
|
||||||
@ -2672,31 +2673,35 @@ QSharedPointer<QSslContext> QSslSocketPrivate::sslContext(QSslSocket *socket)
|
|||||||
|
|
||||||
bool QSslSocketPrivate::isMatchingHostname(const QSslCertificate &cert, const QString &peerName)
|
bool QSslSocketPrivate::isMatchingHostname(const QSslCertificate &cert, const QString &peerName)
|
||||||
{
|
{
|
||||||
const QString lowerPeerName = peerName.toLower();
|
const QString lowerPeerName = QString::fromLatin1(QUrl::toAce(peerName));
|
||||||
const QStringList commonNames = cert.subjectInfo(QSslCertificate::CommonName);
|
const QStringList commonNames = cert.subjectInfo(QSslCertificate::CommonName);
|
||||||
|
|
||||||
for (const QString &commonName : commonNames) {
|
for (const QString &commonName : commonNames) {
|
||||||
if (isMatchingHostname(commonName.toLower(), lowerPeerName))
|
if (isMatchingHostname(commonName, lowerPeerName))
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto subjectAlternativeNames = cert.subjectAlternativeNames();
|
const auto subjectAlternativeNames = cert.subjectAlternativeNames();
|
||||||
const auto altNames = subjectAlternativeNames.equal_range(QSsl::DnsEntry);
|
const auto altNames = subjectAlternativeNames.equal_range(QSsl::DnsEntry);
|
||||||
for (auto it = altNames.first; it != altNames.second; ++it) {
|
for (auto it = altNames.first; it != altNames.second; ++it) {
|
||||||
if (isMatchingHostname(it->toLower(), lowerPeerName))
|
if (isMatchingHostname(*it, lowerPeerName))
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*! \internal
|
||||||
|
Checks if the certificate's name \a cn matches the \a hostname.
|
||||||
|
\a hostname must be normalized in ASCII-Compatible Encoding, but \a cn is not normalized
|
||||||
|
*/
|
||||||
bool QSslSocketPrivate::isMatchingHostname(const QString &cn, const QString &hostname)
|
bool QSslSocketPrivate::isMatchingHostname(const QString &cn, const QString &hostname)
|
||||||
{
|
{
|
||||||
int wildcard = cn.indexOf(QLatin1Char('*'));
|
int wildcard = cn.indexOf(QLatin1Char('*'));
|
||||||
|
|
||||||
// Check this is a wildcard cert, if not then just compare the strings
|
// Check this is a wildcard cert, if not then just compare the strings
|
||||||
if (wildcard < 0)
|
if (wildcard < 0)
|
||||||
return cn == hostname;
|
return QLatin1String(QUrl::toAce(cn)) == hostname;
|
||||||
|
|
||||||
int firstCnDot = cn.indexOf(QLatin1Char('.'));
|
int firstCnDot = cn.indexOf(QLatin1Char('.'));
|
||||||
int secondCnDot = cn.indexOf(QLatin1Char('.'), firstCnDot+1);
|
int secondCnDot = cn.indexOf(QLatin1Char('.'), firstCnDot+1);
|
||||||
@ -2713,13 +2718,21 @@ bool QSslSocketPrivate::isMatchingHostname(const QString &cn, const QString &hos
|
|||||||
if (cn.lastIndexOf(QLatin1Char('*')) != wildcard)
|
if (cn.lastIndexOf(QLatin1Char('*')) != wildcard)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
// Reject wildcard character embedded within the A-labels or U-labels of an internationalized
|
||||||
|
// domain name (RFC6125 section 7.2)
|
||||||
|
if (cn.startsWith(QLatin1String("xn--"), Qt::CaseInsensitive))
|
||||||
|
return false;
|
||||||
|
|
||||||
// Check characters preceding * (if any) match
|
// Check characters preceding * (if any) match
|
||||||
if (wildcard && (hostname.leftRef(wildcard) != cn.leftRef(wildcard)))
|
if (wildcard && hostname.leftRef(wildcard).compare(cn.leftRef(wildcard), Qt::CaseInsensitive) != 0)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
// Check characters following first . match
|
// Check characters following first . match
|
||||||
if (hostname.midRef(hostname.indexOf(QLatin1Char('.'))) != cn.midRef(firstCnDot))
|
int hnDot = hostname.indexOf(QLatin1Char('.'));
|
||||||
|
if (hostname.midRef(hnDot + 1) != cn.midRef(firstCnDot + 1)
|
||||||
|
&& hostname.midRef(hnDot + 1) != QLatin1String(QUrl::toAce(cn.mid(firstCnDot + 1)))) {
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the hostname is an IP address, if so then wildcards are not allowed
|
// Check if the hostname is an IP address, if so then wildcards are not allowed
|
||||||
QHostAddress addr(hostname);
|
QHostAddress addr(hostname);
|
||||||
|
|||||||
@ -151,7 +151,8 @@ public:
|
|||||||
QRegExp::PatternSyntax syntax);
|
QRegExp::PatternSyntax syntax);
|
||||||
static void addDefaultCaCertificate(const QSslCertificate &cert);
|
static void addDefaultCaCertificate(const QSslCertificate &cert);
|
||||||
static void addDefaultCaCertificates(const QList<QSslCertificate> &certs);
|
static void addDefaultCaCertificates(const QList<QSslCertificate> &certs);
|
||||||
static bool isMatchingHostname(const QSslCertificate &cert, const QString &peerName);
|
Q_AUTOTEST_EXPORT static bool isMatchingHostname(const QSslCertificate &cert,
|
||||||
|
const QString &peerName);
|
||||||
Q_AUTOTEST_EXPORT static bool isMatchingHostname(const QString &cn, const QString &hostname);
|
Q_AUTOTEST_EXPORT static bool isMatchingHostname(const QString &cn, const QString &hostname);
|
||||||
|
|
||||||
#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
|
#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
|
||||||
|
|||||||
@ -402,11 +402,6 @@ namespace QtAndroid
|
|||||||
if (surfaceId == -1)
|
if (surfaceId == -1)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
QMutexLocker lock(&m_surfacesMutex);
|
|
||||||
const auto &it = m_surfaces.find(surfaceId);
|
|
||||||
if (it != m_surfaces.end())
|
|
||||||
m_surfaces.remove(surfaceId);
|
|
||||||
|
|
||||||
QJNIEnvironmentPrivate env;
|
QJNIEnvironmentPrivate env;
|
||||||
if (!env)
|
if (!env)
|
||||||
return;
|
return;
|
||||||
@ -583,14 +578,18 @@ static void setSurface(JNIEnv *env, jobject /*thiz*/, jint id, jobject jSurface,
|
|||||||
{
|
{
|
||||||
QMutexLocker lock(&m_surfacesMutex);
|
QMutexLocker lock(&m_surfacesMutex);
|
||||||
const auto &it = m_surfaces.find(id);
|
const auto &it = m_surfaces.find(id);
|
||||||
if (it.value() == nullptr) // This should never happen...
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (it == m_surfaces.end()) {
|
if (it == m_surfaces.end()) {
|
||||||
qWarning()<<"Can't find surface" << id;
|
qWarning()<<"Can't find surface" << id;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
it.value()->surfaceChanged(env, jSurface, w, h);
|
auto surfaceClient = it.value();
|
||||||
|
if (!surfaceClient) // This should never happen...
|
||||||
|
return;
|
||||||
|
|
||||||
|
surfaceClient->surfaceChanged(env, jSurface, w, h);
|
||||||
|
|
||||||
|
if (!jSurface)
|
||||||
|
m_surfaces.erase(it);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void setDisplayMetrics(JNIEnv */*env*/, jclass /*clazz*/,
|
static void setDisplayMetrics(JNIEnv */*env*/, jclass /*clazz*/,
|
||||||
|
|||||||
@ -286,7 +286,7 @@ QT_END_NAMESPACE
|
|||||||
if (qEnvironmentVariableIsEmpty("QT_MAC_DISABLE_FOREGROUND_APPLICATION_TRANSFORM")) {
|
if (qEnvironmentVariableIsEmpty("QT_MAC_DISABLE_FOREGROUND_APPLICATION_TRANSFORM")) {
|
||||||
if (QSysInfo::macVersion() >= QSysInfo::MV_10_12) {
|
if (QSysInfo::macVersion() >= QSysInfo::MV_10_12) {
|
||||||
// Move the application window to front to avoid launching behind the terminal.
|
// Move the application window to front to avoid launching behind the terminal.
|
||||||
// Ignoring other apps is neccessary (we must ignore the terminal), but makes
|
// Ignoring other apps is necessary (we must ignore the terminal), but makes
|
||||||
// Qt apps play slightly less nice with other apps when lanching from Finder
|
// Qt apps play slightly less nice with other apps when lanching from Finder
|
||||||
// (See the activateIgnoringOtherApps docs.)
|
// (See the activateIgnoringOtherApps docs.)
|
||||||
[[NSApplication sharedApplication] activateIgnoringOtherApps:YES];
|
[[NSApplication sharedApplication] activateIgnoringOtherApps:YES];
|
||||||
|
|||||||
@ -429,7 +429,7 @@ static QString strippedText(QString s)
|
|||||||
{
|
{
|
||||||
// Call this functions if mFileMode, mFileOptions,
|
// Call this functions if mFileMode, mFileOptions,
|
||||||
// mNameFilterDropDownList or mQDirFilter changes.
|
// mNameFilterDropDownList or mQDirFilter changes.
|
||||||
// The savepanel does not contain the neccessary functions for this.
|
// The savepanel does not contain the necessary functions for this.
|
||||||
const QFileDialogOptions::FileMode fileMode = mOptions->fileMode();
|
const QFileDialogOptions::FileMode fileMode = mOptions->fileMode();
|
||||||
bool chooseFilesOnly = fileMode == QFileDialogOptions::ExistingFile
|
bool chooseFilesOnly = fileMode == QFileDialogOptions::ExistingFile
|
||||||
|| fileMode == QFileDialogOptions::ExistingFiles;
|
|| fileMode == QFileDialogOptions::ExistingFiles;
|
||||||
|
|||||||
@ -340,7 +340,7 @@ QCocoaIntegration::QCocoaIntegration(const QStringList ¶mList)
|
|||||||
// from the terminal. On 10.12+ this call has been moved to applicationDidFinishLauching
|
// from the terminal. On 10.12+ this call has been moved to applicationDidFinishLauching
|
||||||
// to work around issues with loss of focus at startup.
|
// to work around issues with loss of focus at startup.
|
||||||
if (QSysInfo::macVersion() < QSysInfo::MV_10_12) {
|
if (QSysInfo::macVersion() < QSysInfo::MV_10_12) {
|
||||||
// Ignoring other apps is neccessary (we must ignore the terminal), but makes
|
// Ignoring other apps is necessary (we must ignore the terminal), but makes
|
||||||
// Qt apps play slightly less nice with other apps when lanching from Finder
|
// Qt apps play slightly less nice with other apps when lanching from Finder
|
||||||
// (See the activateIgnoringOtherApps docs.)
|
// (See the activateIgnoringOtherApps docs.)
|
||||||
[cocoaApplication activateIgnoringOtherApps : YES];
|
[cocoaApplication activateIgnoringOtherApps : YES];
|
||||||
|
|||||||
@ -57,7 +57,7 @@
|
|||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
static const char *standardButtonText(int button)
|
static QByteArray standardButtonText(int button)
|
||||||
{
|
{
|
||||||
return QGtk3Theme::defaultStandardButtonText(button).toUtf8();
|
return QGtk3Theme::defaultStandardButtonText(button).toUtf8();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -117,7 +117,7 @@
|
|||||||
"-lsqlite3"
|
"-lsqlite3"
|
||||||
],
|
],
|
||||||
"use": [
|
"use": [
|
||||||
{ "lib": "zlib", "condition": "!config.win32" }
|
{ "lib": "zlib", "condition": "!config.win32 && features.system-zlib" }
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@ -95,6 +95,9 @@ src_3rdparty_libpng.target = sub-3rdparty-libpng
|
|||||||
src_3rdparty_freetype.subdir = $$PWD/3rdparty/freetype
|
src_3rdparty_freetype.subdir = $$PWD/3rdparty/freetype
|
||||||
src_3rdparty_freetype.target = sub-3rdparty-freetype
|
src_3rdparty_freetype.target = sub-3rdparty-freetype
|
||||||
|
|
||||||
|
src_3rdparty_gradle.subdir = $$PWD/3rdparty/gradle
|
||||||
|
src_3rdparty_gradle.target = sub-3rdparty-gradle
|
||||||
|
|
||||||
src_angle.subdir = $$PWD/angle
|
src_angle.subdir = $$PWD/angle
|
||||||
src_angle.target = sub-angle
|
src_angle.target = sub-angle
|
||||||
|
|
||||||
@ -204,7 +207,7 @@ SUBDIRS += src_plugins
|
|||||||
|
|
||||||
nacl: SUBDIRS -= src_network src_testlib
|
nacl: SUBDIRS -= src_network src_testlib
|
||||||
|
|
||||||
android: SUBDIRS += src_android
|
android: SUBDIRS += src_android src_3rdparty_gradle
|
||||||
|
|
||||||
TR_EXCLUDE = \
|
TR_EXCLUDE = \
|
||||||
src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_uic src_tools_qlalr \
|
src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_uic src_tools_qlalr \
|
||||||
|
|||||||
@ -2327,7 +2327,7 @@ void QTest::qSleep(int ms)
|
|||||||
#elif defined(Q_OS_WIN)
|
#elif defined(Q_OS_WIN)
|
||||||
Sleep(uint(ms));
|
Sleep(uint(ms));
|
||||||
#else
|
#else
|
||||||
struct timespec ts = { ms / 1000, (ms % 1000) * 1000 * 1000 };
|
struct timespec ts = { time_t(ms / 1000), (ms % 1000) * 1000 * 1000 };
|
||||||
nanosleep(&ts, NULL);
|
nanosleep(&ts, NULL);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|||||||
@ -5998,7 +5998,7 @@ void QWidgetPrivate::resolveLocale()
|
|||||||
Q_Q(const QWidget);
|
Q_Q(const QWidget);
|
||||||
|
|
||||||
if (!q->testAttribute(Qt::WA_SetLocale)) {
|
if (!q->testAttribute(Qt::WA_SetLocale)) {
|
||||||
setLocale_helper(q->isWindow()
|
setLocale_helper(q->isWindow() && !q->testAttribute(Qt::WA_WindowPropagation)
|
||||||
? QLocale()
|
? QLocale()
|
||||||
: q->parentWidget()->locale());
|
: q->parentWidget()->locale());
|
||||||
}
|
}
|
||||||
|
|||||||
@ -2092,15 +2092,15 @@ void QDockAreaLayoutInfo::reparentWidgets(QWidget *parent)
|
|||||||
const QDockAreaLayoutItem &item = item_list.at(i);
|
const QDockAreaLayoutItem &item = item_list.at(i);
|
||||||
if (item.flags & QDockAreaLayoutItem::GapItem)
|
if (item.flags & QDockAreaLayoutItem::GapItem)
|
||||||
continue;
|
continue;
|
||||||
if (item.skip())
|
|
||||||
continue;
|
|
||||||
if (item.subinfo)
|
if (item.subinfo)
|
||||||
item.subinfo->reparentWidgets(parent);
|
item.subinfo->reparentWidgets(parent);
|
||||||
if (item.widgetItem) {
|
if (item.widgetItem) {
|
||||||
QWidget *w = item.widgetItem->widget();
|
QWidget *w = item.widgetItem->widget();
|
||||||
|
if (qobject_cast<QDockWidgetGroupWindow *>(w))
|
||||||
|
continue;
|
||||||
if (w->parent() != parent) {
|
if (w->parent() != parent) {
|
||||||
bool hidden = w->isHidden();
|
bool hidden = w->isHidden();
|
||||||
w->setParent(parent);
|
w->setParent(parent, w->windowFlags());
|
||||||
if (!hidden)
|
if (!hidden)
|
||||||
w->show();
|
w->show();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -31,6 +31,8 @@ else:!qtConfig(process): SUBDIRS -= tools
|
|||||||
!qtHaveModule(concurrent): SUBDIRS -= concurrent
|
!qtHaveModule(concurrent): SUBDIRS -= concurrent
|
||||||
!qtHaveModule(network): SUBDIRS -= network
|
!qtHaveModule(network): SUBDIRS -= network
|
||||||
!qtHaveModule(dbus): SUBDIRS -= dbus
|
!qtHaveModule(dbus): SUBDIRS -= dbus
|
||||||
|
!qtHaveModule(xml): SUBDIRS -= xml
|
||||||
|
!qtHaveModule(sql): SUBDIRS -= sql
|
||||||
|
|
||||||
# Disable the QtDBus tests if we can't connect to the session bus
|
# Disable the QtDBus tests if we can't connect to the session bus
|
||||||
!cross_compile:qtHaveModule(dbus) {
|
!cross_compile:qtHaveModule(dbus) {
|
||||||
|
|||||||
@ -50,6 +50,11 @@ SUBDIRS=\
|
|||||||
qprocess \
|
qprocess \
|
||||||
qtextstream
|
qtextstream
|
||||||
|
|
||||||
|
!qtHaveModule(concurrent): SUBDIRS -= \
|
||||||
|
qdebug \
|
||||||
|
qlockfile \
|
||||||
|
qurl
|
||||||
|
|
||||||
!qtConfig(private_tests): SUBDIRS -= \
|
!qtConfig(private_tests): SUBDIRS -= \
|
||||||
qabstractfileengine \
|
qabstractfileengine \
|
||||||
qfileinfo \
|
qfileinfo \
|
||||||
|
|||||||
@ -99,14 +99,11 @@ private slots:
|
|||||||
|
|
||||||
void entryListWithSymLinks();
|
void entryListWithSymLinks();
|
||||||
|
|
||||||
void mkdir_data();
|
void mkdirRmdir_data();
|
||||||
void mkdir();
|
void mkdirRmdir();
|
||||||
|
|
||||||
void makedirReturnCode();
|
void makedirReturnCode();
|
||||||
|
|
||||||
void rmdir_data();
|
|
||||||
void rmdir();
|
|
||||||
|
|
||||||
void removeRecursively_data();
|
void removeRecursively_data();
|
||||||
void removeRecursively();
|
void removeRecursively();
|
||||||
void removeRecursivelyFailure();
|
void removeRecursivelyFailure();
|
||||||
@ -342,26 +339,29 @@ void tst_QDir::setPath()
|
|||||||
QCOMPARE(shared.entryList(), entries2);
|
QCOMPARE(shared.entryList(), entries2);
|
||||||
}
|
}
|
||||||
|
|
||||||
void tst_QDir::mkdir_data()
|
void tst_QDir::mkdirRmdir_data()
|
||||||
{
|
{
|
||||||
QTest::addColumn<QString>("path");
|
QTest::addColumn<QString>("path");
|
||||||
QTest::addColumn<bool>("recurse");
|
QTest::addColumn<bool>("recurse");
|
||||||
|
|
||||||
QStringList dirs;
|
QStringList dirs;
|
||||||
dirs << QDir::currentPath() + "/testdir/one/two/three"
|
dirs << "testdir/one"
|
||||||
<< QDir::currentPath() + "/testdir/two"
|
<< "testdir/two/three/four"
|
||||||
<< QDir::currentPath() + "/testdir/two/three";
|
<< "testdir/../testdir/three";
|
||||||
QTest::newRow("data0") << dirs.at(0) << true;
|
QTest::newRow("plain") << QDir::currentPath() + "/" + dirs.at(0) << false;
|
||||||
QTest::newRow("data1") << dirs.at(1) << false;
|
QTest::newRow("recursive") << QDir::currentPath() + "/" + dirs.at(1) << true;
|
||||||
QTest::newRow("data2") << dirs.at(2) << false; // note: requires data1 to have been run!
|
QTest::newRow("with-..") << QDir::currentPath() + "/" + dirs.at(2) << false;
|
||||||
|
|
||||||
|
QTest::newRow("relative-plain") << dirs.at(0) << false;
|
||||||
|
QTest::newRow("relative-recursive") << dirs.at(1) << true;
|
||||||
|
QTest::newRow("relative-with-..") << dirs.at(2) << false;
|
||||||
|
|
||||||
// Ensure that none of these directories already exist
|
// Ensure that none of these directories already exist
|
||||||
QDir dir;
|
|
||||||
for (int i = 0; i < dirs.count(); ++i)
|
for (int i = 0; i < dirs.count(); ++i)
|
||||||
dir.rmpath(dirs.at(i));
|
QVERIFY(!QFile::exists(dirs.at(i)));
|
||||||
}
|
}
|
||||||
|
|
||||||
void tst_QDir::mkdir()
|
void tst_QDir::mkdirRmdir()
|
||||||
{
|
{
|
||||||
QFETCH(QString, path);
|
QFETCH(QString, path);
|
||||||
QFETCH(bool, recurse);
|
QFETCH(bool, recurse);
|
||||||
@ -376,6 +376,15 @@ void tst_QDir::mkdir()
|
|||||||
//make sure it really exists (ie that mkdir returns the right value)
|
//make sure it really exists (ie that mkdir returns the right value)
|
||||||
QFileInfo fi(path);
|
QFileInfo fi(path);
|
||||||
QVERIFY2(fi.exists() && fi.isDir(), msgDoesNotExist(path).constData());
|
QVERIFY2(fi.exists() && fi.isDir(), msgDoesNotExist(path).constData());
|
||||||
|
|
||||||
|
if (recurse)
|
||||||
|
QVERIFY(dir.rmpath(path));
|
||||||
|
else
|
||||||
|
QVERIFY(dir.rmdir(path));
|
||||||
|
|
||||||
|
//make sure it really doesn't exist (ie that rmdir returns the right value)
|
||||||
|
fi.refresh();
|
||||||
|
QVERIFY(!fi.exists());
|
||||||
}
|
}
|
||||||
|
|
||||||
void tst_QDir::makedirReturnCode()
|
void tst_QDir::makedirReturnCode()
|
||||||
@ -405,32 +414,6 @@ void tst_QDir::makedirReturnCode()
|
|||||||
f.remove();
|
f.remove();
|
||||||
}
|
}
|
||||||
|
|
||||||
void tst_QDir::rmdir_data()
|
|
||||||
{
|
|
||||||
QTest::addColumn<QString>("path");
|
|
||||||
QTest::addColumn<bool>("recurse");
|
|
||||||
|
|
||||||
QTest::newRow("data0") << QDir::currentPath() + "/testdir/one/two/three" << true;
|
|
||||||
QTest::newRow("data1") << QDir::currentPath() + "/testdir/two/three" << false;
|
|
||||||
QTest::newRow("data2") << QDir::currentPath() + "/testdir/two" << false;
|
|
||||||
}
|
|
||||||
|
|
||||||
void tst_QDir::rmdir()
|
|
||||||
{
|
|
||||||
QFETCH(QString, path);
|
|
||||||
QFETCH(bool, recurse);
|
|
||||||
|
|
||||||
QDir dir;
|
|
||||||
if (recurse)
|
|
||||||
QVERIFY(dir.rmpath(path));
|
|
||||||
else
|
|
||||||
QVERIFY(dir.rmdir(path));
|
|
||||||
|
|
||||||
//make sure it really doesn't exist (ie that rmdir returns the right value)
|
|
||||||
QFileInfo fi(path);
|
|
||||||
QVERIFY(!fi.exists());
|
|
||||||
}
|
|
||||||
|
|
||||||
void tst_QDir::removeRecursively_data()
|
void tst_QDir::removeRecursively_data()
|
||||||
{
|
{
|
||||||
QTest::addColumn<QString>("path");
|
QTest::addColumn<QString>("path");
|
||||||
|
|||||||
@ -8,6 +8,10 @@ qtHaveModule(gui): SUBDIRS += \
|
|||||||
qidentityproxymodel \
|
qidentityproxymodel \
|
||||||
qitemselectionmodel \
|
qitemselectionmodel \
|
||||||
|
|
||||||
qtHaveModule(widgets): SUBDIRS += \
|
qtHaveModule(widgets) {
|
||||||
qitemmodel \
|
SUBDIRS += \
|
||||||
qsortfilterproxymodel \
|
qsortfilterproxymodel
|
||||||
|
|
||||||
|
qtHaveModule(sql): SUBDIRS += \
|
||||||
|
qitemmodel
|
||||||
|
}
|
||||||
|
|||||||
@ -3994,21 +3994,21 @@ class DropOnOddRows : public QAbstractListModel
|
|||||||
public:
|
public:
|
||||||
DropOnOddRows(QObject *parent = 0) : QAbstractListModel(parent) {}
|
DropOnOddRows(QObject *parent = 0) : QAbstractListModel(parent) {}
|
||||||
|
|
||||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const
|
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override
|
||||||
{
|
{
|
||||||
if (role == Qt::DisplayRole)
|
if (role == Qt::DisplayRole)
|
||||||
return (index.row() % 2 == 0) ? "A" : "B";
|
return (index.row() % 2 == 0) ? "A" : "B";
|
||||||
return QVariant();
|
return QVariant();
|
||||||
}
|
}
|
||||||
|
|
||||||
int rowCount(const QModelIndex &parent = QModelIndex()) const
|
int rowCount(const QModelIndex &parent = QModelIndex()) const override
|
||||||
{
|
{
|
||||||
Q_UNUSED(parent);
|
Q_UNUSED(parent);
|
||||||
return 10;
|
return 10;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool canDropMimeData(const QMimeData *, Qt::DropAction,
|
bool canDropMimeData(const QMimeData *, Qt::DropAction,
|
||||||
int row, int column, const QModelIndex &parent) const Q_DECL_OVERRIDE
|
int row, int column, const QModelIndex &parent) const override
|
||||||
{
|
{
|
||||||
Q_UNUSED(row);
|
Q_UNUSED(row);
|
||||||
Q_UNUSED(column);
|
Q_UNUSED(column);
|
||||||
|
|||||||
@ -32,6 +32,7 @@
|
|||||||
#include "qjsonobject.h"
|
#include "qjsonobject.h"
|
||||||
#include "qjsonvalue.h"
|
#include "qjsonvalue.h"
|
||||||
#include "qjsondocument.h"
|
#include "qjsondocument.h"
|
||||||
|
#include "qregularexpression.h"
|
||||||
#include <limits>
|
#include <limits>
|
||||||
|
|
||||||
#define INVALID_UNICODE "\xCE\xBA\xE1"
|
#define INVALID_UNICODE "\xCE\xBA\xE1"
|
||||||
@ -49,6 +50,7 @@ private Q_SLOTS:
|
|||||||
void testNumbers();
|
void testNumbers();
|
||||||
void testNumbers_2();
|
void testNumbers_2();
|
||||||
void testNumbers_3();
|
void testNumbers_3();
|
||||||
|
void testNumbers_4();
|
||||||
|
|
||||||
void testObjectSimple();
|
void testObjectSimple();
|
||||||
void testObjectSmallKeys();
|
void testObjectSmallKeys();
|
||||||
@ -375,6 +377,33 @@ void tst_QtJson::testNumbers_3()
|
|||||||
QVERIFY(d1_1 != d2_1);
|
QVERIFY(d1_1 != d2_1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void tst_QtJson::testNumbers_4()
|
||||||
|
{
|
||||||
|
// no exponent notation used to print numbers between -2^64 and 2^64
|
||||||
|
QJsonArray array;
|
||||||
|
array << QJsonValue(+1000000000000000.0);
|
||||||
|
array << QJsonValue(-1000000000000000.0);
|
||||||
|
array << QJsonValue(+9007199254740992.0);
|
||||||
|
array << QJsonValue(-9007199254740992.0);
|
||||||
|
array << QJsonValue(+9223372036854775808.0);
|
||||||
|
array << QJsonValue(-9223372036854775808.0);
|
||||||
|
array << QJsonValue(+18446744073709551616.0);
|
||||||
|
array << QJsonValue(-18446744073709551616.0);
|
||||||
|
const QByteArray json(QJsonDocument(array).toJson());
|
||||||
|
const QByteArray expected =
|
||||||
|
"[\n"
|
||||||
|
" 1000000000000000,\n"
|
||||||
|
" -1000000000000000,\n"
|
||||||
|
" 9007199254740992,\n"
|
||||||
|
" -9007199254740992,\n"
|
||||||
|
" 9223372036854776000,\n"
|
||||||
|
" -9223372036854776000,\n"
|
||||||
|
" 18446744073709552000,\n"
|
||||||
|
" -18446744073709552000\n"
|
||||||
|
"]\n";
|
||||||
|
QCOMPARE(json, expected);
|
||||||
|
}
|
||||||
|
|
||||||
void tst_QtJson::testObjectSimple()
|
void tst_QtJson::testObjectSimple()
|
||||||
{
|
{
|
||||||
QJsonObject object;
|
QJsonObject object;
|
||||||
|
|||||||
@ -1,3 +1,5 @@
|
|||||||
TEMPLATE = subdirs
|
TEMPLATE = subdirs
|
||||||
SUBDIRS = qmimedatabase-xml
|
qtHaveModule(concurrent) {
|
||||||
unix:!mac:!qnx: SUBDIRS += qmimedatabase-cache
|
SUBDIRS = qmimedatabase-xml
|
||||||
|
unix:!darwin:!qnx: SUBDIRS += qmimedatabase-cache
|
||||||
|
}
|
||||||
|
|||||||
@ -6,7 +6,6 @@ SUBDIRS=\
|
|||||||
qresultstore \
|
qresultstore \
|
||||||
qfuture \
|
qfuture \
|
||||||
qfuturesynchronizer \
|
qfuturesynchronizer \
|
||||||
qfuturewatcher \
|
|
||||||
qmutex \
|
qmutex \
|
||||||
qmutexlocker \
|
qmutexlocker \
|
||||||
qreadlocker \
|
qreadlocker \
|
||||||
@ -18,3 +17,8 @@ SUBDIRS=\
|
|||||||
qthreadstorage \
|
qthreadstorage \
|
||||||
qwaitcondition \
|
qwaitcondition \
|
||||||
qwritelocker
|
qwritelocker
|
||||||
|
|
||||||
|
qtHaveModule(concurrent) {
|
||||||
|
SUBDIRS += \
|
||||||
|
qfuturewatcher
|
||||||
|
}
|
||||||
|
|||||||
@ -1,3 +1,3 @@
|
|||||||
TEMPLATE=subdirs
|
TEMPLATE=subdirs
|
||||||
qtHaveModule(network): SUBDIRS= \
|
qtHaveModule(network):qtHaveModule(xml): SUBDIRS= \
|
||||||
qxmlstream
|
qxmlstream
|
||||||
|
|||||||
@ -34,3 +34,6 @@ SUBDIRS+=\
|
|||||||
qdbusabstractinterface \
|
qdbusabstractinterface \
|
||||||
qdbusinterface \
|
qdbusinterface \
|
||||||
qdbusmarshall
|
qdbusmarshall
|
||||||
|
|
||||||
|
!qtHaveModule(xml): SUBDIRS -= \
|
||||||
|
qdbusxmlparser
|
||||||
|
|||||||
@ -35,3 +35,7 @@ win32:SUBDIRS -= qtextpiecetable
|
|||||||
qtextpiecetable \
|
qtextpiecetable \
|
||||||
qzip \
|
qzip \
|
||||||
qtextodfwriter
|
qtextodfwriter
|
||||||
|
|
||||||
|
!qtHaveModule(xml): SUBDIRS -= \
|
||||||
|
qcssparser \
|
||||||
|
qtextdocument
|
||||||
|
|||||||
11
tests/auto/network/ssl/qsslsocket/certs/xn--schufele-2za.crt
Normal file
11
tests/auto/network/ssl/qsslsocket/certs/xn--schufele-2za.crt
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
-----BEGIN CERTIFICATE-----
|
||||||
|
MIIBfTCCASegAwIBAgIJANTX9XvqKXllMA0GCSqGSIb3DQEBCwUAMBoxGDAWBgNV
|
||||||
|
BAMMDyouU0NIw4RVRkVMRS5ERTAeFw0xNzAzMDcwOTIwMzZaFw0xNzA0MDYwOTIw
|
||||||
|
MzZaMBoxGDAWBgNVBAMMDyouU0NIw4RVRkVMRS5ERTBcMA0GCSqGSIb3DQEBAQUA
|
||||||
|
A0sAMEgCQQDZGJFl85dMxps7EryuNyP1apWrBqp7mlwgfbCN9wboyUZBLCWM58UK
|
||||||
|
6oJPg0X19IJUv3UTxD8GH7qQteCXPl4bAgMBAAGjUDBOMB0GA1UdDgQWBBSLuHtk
|
||||||
|
CfEpYnW5Rw7XcO53P/1+jDAfBgNVHSMEGDAWgBSLuHtkCfEpYnW5Rw7XcO53P/1+
|
||||||
|
jDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA0EAXrGVzhGlekW5Zm78tASr
|
||||||
|
5lTF6wn3klqvd2zTqTKuAKWAuBNX46p79g8OGsfY76X9M+/RbUYa7h5BuTL9b45K
|
||||||
|
dw==
|
||||||
|
-----END CERTIFICATE-----
|
||||||
@ -191,6 +191,7 @@ private slots:
|
|||||||
void supportedCiphers();
|
void supportedCiphers();
|
||||||
void systemCaCertificates();
|
void systemCaCertificates();
|
||||||
void wildcardCertificateNames();
|
void wildcardCertificateNames();
|
||||||
|
void isMatchingHostname();
|
||||||
void wildcard();
|
void wildcard();
|
||||||
void setEmptyKey();
|
void setEmptyKey();
|
||||||
void spontaneousWrite();
|
void spontaneousWrite();
|
||||||
@ -1643,10 +1644,15 @@ void tst_QSslSocket::wildcardCertificateNames()
|
|||||||
{
|
{
|
||||||
// Passing CN matches
|
// Passing CN matches
|
||||||
QCOMPARE( QSslSocketPrivate::isMatchingHostname(QString("www.example.com"), QString("www.example.com")), true );
|
QCOMPARE( QSslSocketPrivate::isMatchingHostname(QString("www.example.com"), QString("www.example.com")), true );
|
||||||
|
QCOMPARE( QSslSocketPrivate::isMatchingHostname(QString("WWW.EXAMPLE.COM"), QString("www.example.com")), true );
|
||||||
QCOMPARE( QSslSocketPrivate::isMatchingHostname(QString("*.example.com"), QString("www.example.com")), true );
|
QCOMPARE( QSslSocketPrivate::isMatchingHostname(QString("*.example.com"), QString("www.example.com")), true );
|
||||||
QCOMPARE( QSslSocketPrivate::isMatchingHostname(QString("xxx*.example.com"), QString("xxxwww.example.com")), true );
|
QCOMPARE( QSslSocketPrivate::isMatchingHostname(QString("xxx*.example.com"), QString("xxxwww.example.com")), true );
|
||||||
QCOMPARE( QSslSocketPrivate::isMatchingHostname(QString("f*.example.com"), QString("foo.example.com")), true );
|
QCOMPARE( QSslSocketPrivate::isMatchingHostname(QString("f*.example.com"), QString("foo.example.com")), true );
|
||||||
QCOMPARE( QSslSocketPrivate::isMatchingHostname(QString("192.168.0.0"), QString("192.168.0.0")), true );
|
QCOMPARE( QSslSocketPrivate::isMatchingHostname(QString("192.168.0.0"), QString("192.168.0.0")), true );
|
||||||
|
QCOMPARE( QSslSocketPrivate::isMatchingHostname(QString("foo.éxample.com"), QString("foo.xn--xample-9ua.com")), true );
|
||||||
|
QCOMPARE( QSslSocketPrivate::isMatchingHostname(QString("*.éxample.com"), QString("foo.xn--xample-9ua.com")), true );
|
||||||
|
QCOMPARE( QSslSocketPrivate::isMatchingHostname(QString("xn--kcry6tjko.example.org"), QString("xn--kcry6tjko.example.org")), true);
|
||||||
|
QCOMPARE( QSslSocketPrivate::isMatchingHostname(QString("*.xn--kcry6tjko.example.org"), QString("xn--kcr.xn--kcry6tjko.example.org")), true);
|
||||||
|
|
||||||
// Failing CN matches
|
// Failing CN matches
|
||||||
QCOMPARE( QSslSocketPrivate::isMatchingHostname(QString("xxx.example.com"), QString("www.example.com")), false );
|
QCOMPARE( QSslSocketPrivate::isMatchingHostname(QString("xxx.example.com"), QString("www.example.com")), false );
|
||||||
@ -1661,6 +1667,26 @@ void tst_QSslSocket::wildcardCertificateNames()
|
|||||||
QCOMPARE( QSslSocketPrivate::isMatchingHostname(QString(""), QString("www")), false );
|
QCOMPARE( QSslSocketPrivate::isMatchingHostname(QString(""), QString("www")), false );
|
||||||
QCOMPARE( QSslSocketPrivate::isMatchingHostname(QString("*"), QString("www")), false );
|
QCOMPARE( QSslSocketPrivate::isMatchingHostname(QString("*"), QString("www")), false );
|
||||||
QCOMPARE( QSslSocketPrivate::isMatchingHostname(QString("*.168.0.0"), QString("192.168.0.0")), false );
|
QCOMPARE( QSslSocketPrivate::isMatchingHostname(QString("*.168.0.0"), QString("192.168.0.0")), false );
|
||||||
|
QCOMPARE( QSslSocketPrivate::isMatchingHostname(QString("xn--kcry6tjko*.example.org"), QString("xn--kcry6tjkoanc.example.org")), false ); // RFC 6125 §7.2
|
||||||
|
QCOMPARE( QSslSocketPrivate::isMatchingHostname(QString("å*.example.org"), QString("xn--la-xia.example.org")), false );
|
||||||
|
}
|
||||||
|
|
||||||
|
void tst_QSslSocket::isMatchingHostname()
|
||||||
|
{
|
||||||
|
// with normalization: (the certificate has *.SCHÄUFELE.DE as a CN)
|
||||||
|
// openssl req -x509 -nodes -subj "/CN=*.SCHÄUFELE.DE" -newkey rsa:512 -keyout /dev/null -out xn--schufele-2za.crt
|
||||||
|
QList<QSslCertificate> certs = QSslCertificate::fromPath(SRCDIR "certs/xn--schufele-2za.crt");
|
||||||
|
QVERIFY(!certs.isEmpty());
|
||||||
|
QSslCertificate cert = certs.first();
|
||||||
|
|
||||||
|
QCOMPARE(QSslSocketPrivate::isMatchingHostname(cert, QString::fromUtf8("WWW.SCHÄUFELE.DE")), true);
|
||||||
|
QCOMPARE(QSslSocketPrivate::isMatchingHostname(cert, QString::fromUtf8("www.xn--schufele-2za.de")), true);
|
||||||
|
QCOMPARE(QSslSocketPrivate::isMatchingHostname(cert, QString::fromUtf8("www.schäufele.de")), true);
|
||||||
|
QCOMPARE(QSslSocketPrivate::isMatchingHostname(cert, QString::fromUtf8("föo.schäufele.de")), true);
|
||||||
|
|
||||||
|
QCOMPARE(QSslSocketPrivate::isMatchingHostname(cert, QString::fromUtf8("foo.foo.xn--schufele-2za.de")), false);
|
||||||
|
QCOMPARE(QSslSocketPrivate::isMatchingHostname(cert, QString::fromUtf8("www.schaufele.de")), false);
|
||||||
|
QCOMPARE(QSslSocketPrivate::isMatchingHostname(cert, QString::fromUtf8("www.schufele.de")), false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void tst_QSslSocket::wildcard()
|
void tst_QSslSocket::wildcard()
|
||||||
|
|||||||
@ -98,53 +98,54 @@ public:
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
CustomTextWidgetIface(CustomTextWidget *w): QAccessibleWidget(w) {}
|
CustomTextWidgetIface(CustomTextWidget *w): QAccessibleWidget(w) {}
|
||||||
void *interface_cast(QAccessible::InterfaceType t) {
|
void *interface_cast(QAccessible::InterfaceType t) override
|
||||||
|
{
|
||||||
if (t == QAccessible::TextInterface)
|
if (t == QAccessible::TextInterface)
|
||||||
return static_cast<QAccessibleTextInterface*>(this);
|
return static_cast<QAccessibleTextInterface*>(this);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
// this is mostly to test the base implementation for textBefore/At/After
|
// this is mostly to test the base implementation for textBefore/At/After
|
||||||
QString text(QAccessible::Text t) const Q_DECL_OVERRIDE
|
QString text(QAccessible::Text t) const override
|
||||||
{
|
{
|
||||||
if (t == QAccessible::Value)
|
if (t == QAccessible::Value)
|
||||||
return textWidget()->text;
|
return textWidget()->text;
|
||||||
return QAccessibleWidget::text(t);
|
return QAccessibleWidget::text(t);
|
||||||
}
|
}
|
||||||
|
|
||||||
QString textBeforeOffset(int offset, QAccessible::TextBoundaryType boundaryType, int *startOffset, int *endOffset) const
|
QString textBeforeOffset(int offset, QAccessible::TextBoundaryType boundaryType, int *startOffset, int *endOffset) const override
|
||||||
{
|
{
|
||||||
if (offset == -2)
|
if (offset == -2)
|
||||||
offset = textWidget()->cursorPosition;
|
offset = textWidget()->cursorPosition;
|
||||||
return QAccessibleTextInterface::textBeforeOffset(offset, boundaryType, startOffset, endOffset);
|
return QAccessibleTextInterface::textBeforeOffset(offset, boundaryType, startOffset, endOffset);
|
||||||
}
|
}
|
||||||
QString textAtOffset(int offset, QAccessible::TextBoundaryType boundaryType, int *startOffset, int *endOffset) const
|
QString textAtOffset(int offset, QAccessible::TextBoundaryType boundaryType, int *startOffset, int *endOffset) const override
|
||||||
{
|
{
|
||||||
if (offset == -2)
|
if (offset == -2)
|
||||||
offset = textWidget()->cursorPosition;
|
offset = textWidget()->cursorPosition;
|
||||||
return QAccessibleTextInterface::textAtOffset(offset, boundaryType, startOffset, endOffset);
|
return QAccessibleTextInterface::textAtOffset(offset, boundaryType, startOffset, endOffset);
|
||||||
}
|
}
|
||||||
QString textAfterOffset(int offset, QAccessible::TextBoundaryType boundaryType, int *startOffset, int *endOffset) const
|
QString textAfterOffset(int offset, QAccessible::TextBoundaryType boundaryType, int *startOffset, int *endOffset) const override
|
||||||
{
|
{
|
||||||
if (offset == -2)
|
if (offset == -2)
|
||||||
offset = textWidget()->cursorPosition;
|
offset = textWidget()->cursorPosition;
|
||||||
return QAccessibleTextInterface::textAfterOffset(offset, boundaryType, startOffset, endOffset);
|
return QAccessibleTextInterface::textAfterOffset(offset, boundaryType, startOffset, endOffset);
|
||||||
}
|
}
|
||||||
|
|
||||||
void selection(int, int *startOffset, int *endOffset) const Q_DECL_OVERRIDE
|
void selection(int, int *startOffset, int *endOffset) const override
|
||||||
{ *startOffset = *endOffset = -1; }
|
{ *startOffset = *endOffset = -1; }
|
||||||
int selectionCount() const Q_DECL_OVERRIDE { return 0; }
|
int selectionCount() const override { return 0; }
|
||||||
void addSelection(int, int) Q_DECL_OVERRIDE {}
|
void addSelection(int, int) override {}
|
||||||
void removeSelection(int) Q_DECL_OVERRIDE {}
|
void removeSelection(int) override {}
|
||||||
void setSelection(int, int, int) Q_DECL_OVERRIDE {}
|
void setSelection(int, int, int) override {}
|
||||||
int cursorPosition() const Q_DECL_OVERRIDE { return textWidget()->cursorPosition; }
|
int cursorPosition() const override { return textWidget()->cursorPosition; }
|
||||||
void setCursorPosition(int position) Q_DECL_OVERRIDE { textWidget()->cursorPosition = position; }
|
void setCursorPosition(int position) override { textWidget()->cursorPosition = position; }
|
||||||
QString text(int startOffset, int endOffset) const Q_DECL_OVERRIDE { return textWidget()->text.mid(startOffset, endOffset); }
|
QString text(int startOffset, int endOffset) const override { return textWidget()->text.mid(startOffset, endOffset); }
|
||||||
int characterCount() const Q_DECL_OVERRIDE { return textWidget()->text.length(); }
|
int characterCount() const override { return textWidget()->text.length(); }
|
||||||
QRect characterRect(int) const Q_DECL_OVERRIDE { return QRect(); }
|
QRect characterRect(int) const override { return QRect(); }
|
||||||
int offsetAtPoint(const QPoint &) const Q_DECL_OVERRIDE { return 0; }
|
int offsetAtPoint(const QPoint &) const override { return 0; }
|
||||||
void scrollToSubstring(int, int) Q_DECL_OVERRIDE {}
|
void scrollToSubstring(int, int) override {}
|
||||||
QString attributes(int, int *, int *) const Q_DECL_OVERRIDE
|
QString attributes(int, int *, int *) const override
|
||||||
{ return QString(); }
|
{ return QString(); }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|||||||
@ -277,6 +277,7 @@ private slots:
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
void setLocale();
|
void setLocale();
|
||||||
|
void propagateLocale();
|
||||||
void deleteStyle();
|
void deleteStyle();
|
||||||
void multipleToplevelFocusCheck();
|
void multipleToplevelFocusCheck();
|
||||||
void setFocus();
|
void setFocus();
|
||||||
@ -1205,6 +1206,33 @@ void tst_QWidget::setLocale()
|
|||||||
QCOMPARE(child2.locale(), QLocale(QLocale::French));
|
QCOMPARE(child2.locale(), QLocale(QLocale::French));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void tst_QWidget::propagateLocale()
|
||||||
|
{
|
||||||
|
QWidget parent;
|
||||||
|
parent.setLocale(QLocale::French);
|
||||||
|
// Non-window widget; propagates locale:
|
||||||
|
QWidget *child = new QWidget(&parent);
|
||||||
|
QVERIFY(!child->isWindow());
|
||||||
|
QVERIFY(!child->testAttribute(Qt::WA_WindowPropagation));
|
||||||
|
QCOMPARE(child->locale(), QLocale(QLocale::French));
|
||||||
|
parent.setLocale(QLocale::Italian);
|
||||||
|
QCOMPARE(child->locale(), QLocale(QLocale::Italian));
|
||||||
|
delete child;
|
||||||
|
// Window: doesn't propagate locale:
|
||||||
|
child = new QWidget(&parent, Qt::Window);
|
||||||
|
QVERIFY(child->isWindow());
|
||||||
|
QVERIFY(!child->testAttribute(Qt::WA_WindowPropagation));
|
||||||
|
QCOMPARE(child->locale(), QLocale());
|
||||||
|
parent.setLocale(QLocale::French);
|
||||||
|
QCOMPARE(child->locale(), QLocale());
|
||||||
|
// ... unless we tell it to:
|
||||||
|
child->setAttribute(Qt::WA_WindowPropagation, true);
|
||||||
|
QVERIFY(child->testAttribute(Qt::WA_WindowPropagation));
|
||||||
|
QCOMPARE(child->locale(), QLocale(QLocale::French));
|
||||||
|
parent.setLocale(QLocale::Italian);
|
||||||
|
QCOMPARE(child->locale(), QLocale(QLocale::Italian));
|
||||||
|
}
|
||||||
|
|
||||||
void tst_QWidget::visible_setWindowOpacity()
|
void tst_QWidget::visible_setWindowOpacity()
|
||||||
{
|
{
|
||||||
QScopedPointer<QWidget> testWidget(new QWidget);
|
QScopedPointer<QWidget> testWidget(new QWidget);
|
||||||
|
|||||||
@ -1,5 +1,7 @@
|
|||||||
TEMPLATE = subdirs
|
TEMPLATE = subdirs
|
||||||
CONFIG += no_docs_target
|
CONFIG += no_docs_target
|
||||||
|
requires(qtHaveModule(testlib))
|
||||||
|
|
||||||
SUBDIRS = auto
|
SUBDIRS = auto
|
||||||
|
|
||||||
# benchmarks in debug mode is rarely sensible
|
# benchmarks in debug mode is rarely sensible
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user