diff options
authorQt Forward Merge Bot <>2018-05-09 13:48:42 +0200
committerQt Forward Merge Bot <>2018-05-09 13:48:42 +0200
commit552c45bea924279a0a7c2d78c9d7e2959deee11f (patch)
parente110ab6c282790f6f035d52747b8589c448a362b (diff)
parenta7863a58545a6c59eaf16f36905efcbf0e4f94f9 (diff)
Merge remote-tracking branch 'origin/5.11.0' into 5.11
10 files changed, 617 insertions, 39 deletions
diff --git a/bin/ b/bin/
index 9a889c062b..78fe0663b5 100755
--- a/bin/
+++ b/bin/
@@ -921,9 +921,7 @@ foreach my $lib (@modules_to_sync) {
#information used after the syncing
my $pri_install_gfiles = "";
my $pri_install_files = "";
- my $pri_install_ifiles = "";
my $pri_install_pfiles = "";
- my $pri_install_ipfiles = "";
my $pri_install_qpafiles = "";
my $pri_injections = "";
my $pri_clean_files = "";
@@ -1083,13 +1081,11 @@ foreach my $lib (@modules_to_sync) {
# }
my $class_header = "$class ";
$pri_install_gfiles .= $class_header
- unless($pri_install_gfiles =~ $class_header);
+ unless ($shadow || $pri_install_gfiles =~ $class_header);
$injection .= ":$class";
- if ($shadow) {
- $pri_install_ifiles .= "$pri_install_iheader ";
- } else {
+ if (!$shadow) {
# put it into the master file
$master_contents{$public_header} = $requires if (shouldMasterInclude($iheader));
@@ -1101,10 +1097,7 @@ foreach my $lib (@modules_to_sync) {
elsif ($qpa_header) {
$pri_install_qpafiles.= "$pri_install_iheader ";;
- elsif ($shadow) {
- $pri_install_ipfiles .= "$pri_install_iheader ";
- }
- else {
+ elsif (!$shadow) {
$pri_install_pfiles.= "$pri_install_iheader ";;
$pri_injections .= fixPaths($iheader, "$out_basedir/include/$lib")
@@ -1227,10 +1220,8 @@ foreach my $lib (@modules_to_sync) {
#handle the headers.pri for each module
my $headers_pri_contents = "";
$headers_pri_contents .= "SYNCQT.HEADER_FILES = $pri_install_files\n";
- $headers_pri_contents .= "SYNCQT.INJECTED_HEADER_FILES = $pri_install_ifiles\n";
$headers_pri_contents .= "SYNCQT.GENERATED_HEADER_FILES = $pri_install_gfiles\n";
$headers_pri_contents .= "SYNCQT.PRIVATE_HEADER_FILES = $pri_install_pfiles\n";
- $headers_pri_contents .= "SYNCQT.INJECTED_PRIVATE_HEADER_FILES = $pri_install_ipfiles\n";
$headers_pri_contents .= "SYNCQT.QPA_HEADER_FILES = $pri_install_qpafiles\n";
$headers_pri_contents .= "SYNCQT.CLEAN_HEADER_FILES = $pri_clean_files\n";
$headers_pri_contents .= "SYNCQT.INJECTIONS = $pri_injections\n";
diff --git a/dist/changes-5.11.0 b/dist/changes-5.11.0
new file mode 100644
index 0000000000..7f3bdf4b9b
--- /dev/null
+++ b/dist/changes-5.11.0
@@ -0,0 +1,399 @@
+Qt 5.11 introduces many new features and improvements as well as bugfixes
+over the 5.10.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+The Qt version 5.11 series is binary compatible with the 5.10.x series.
+Applications compiled for 5.10 will continue to run with 5.11.
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+* Important Behavior Changes *
+ - [QTBUG-63150] Characters invalid in XML, such as 0x0 or 0xfffe, as well
+ as strings containing unmatched UTF-16 surrogates are now suppressed
+ from the output of QXmlStreamWriter and cause the error flag to be set.
+ - Logging (including qDebug and qWarning):
+ * The QT_LOGGING_TO_CONSOLE environment variable has been deprecated.
+ Use the more specific QT_ASSUME_STDERR_HAS_CONSOLE or
+ QT_FORCE_STDERR_LOGGING, depending on your usecase.
+* General Notes *
+Deprecation Notices
+ - Microsoft Visual Studio 2013 (compiler version 12.0) is no longer
+ supported with this Qt version.
+ - macOS 10.10 is no longer supported with this Qt version.
+Third-Party Code
+ - Removed attribution for QTemporaryFile: The original code got rewritten.
+ - Documented use of "Unicode Character Database (UCD)" in Qt Core.
+ - Clarified use of "Unicode Common Local Data Repository (CLDR)" in the
+ documentation. Also updated SPDX license name / ID.
+ - Sqlite was updated to version 3.23.1
+ - Libdbus-1 code in Qt D-Bus is now properly documented. The code is
+ licensed under AFL-2.1 OR GPL-2.0-or-later.
+ - Bundled HarfBuzz-NG copy updated to 1.7.4.
+* Library *
+ - [QTBUG-38156] Apple Unified Logging is now supported on Apple platforms.
+ - QAbstractItemModel:
+ * Added QAbstractItemModel::checkIndex(), a debugging function for
+ QAbstractItemModel subclasses.
+ - QBitArray:
+ * Added fromBits(), which creates a QBitArray from a dense bit array,
+ and bits(), which returns that.
+ - QDateTime:
+ * [QTBUG-64401] Years up to 9999 can now be parsed without error
+ (previously 8000 and beyond were treated as invalid) in all formats
+ (not only in ISO format). Widgets handling dates now support dates to
+ 9999, likewise.
+ * [QTBUG-63072] When parsing dates and times from strings, fixed-width
+ date-time fields, such as a "dd" for day, QDateTime now rejects all
+ values that should be padded, rather than only doing so when the value
+ is a prefix of some value that would fill the field-width. Use a
+ single letter for the field, e.g. "d" for day, if you want to accept
+ short values. (QDateTimeEdit is not affected.)
+ - QJsonValue:
+ * fromVariant() conversion now converts from QUrl and QUuid using
+ special encoding forms to ensure best JSON compatibility.
+ - QLockFile:
+ * [QTBUG-63425] QLockFile can now properly conclude that a lock file
+ from a previous boot of the same device is stale and can be removed.
+ This is implemented only for Linux and Apple operating systems.
+ - QMetaObject:
+ * [QTBUG-66744] It is now possible to use template class instances
+ inheriting from a Q_GADGET in Qml.
+ - QSaveFile:
+ * [QTBUG-66268] Fixed an issue that would cause QSaveFile::commit() to
+ fail if Unix signals were delivered at the same time.
+ - QScopedPointer:
+ * Added get(), for compatibility with std::shared_ptr.
+ - QSharedPointer:
+ * Added get(), for compatibility with std::shared_ptr.
+ - QString:
+ * Added remove() overload taking QLatin1String.
+ - QStringBuilder:
+ * Added support for char16_t characters and strings.
+ * Added support for QStringView.
+ - QSysInfo:
+ * [QTBUG-63425] Added machineUniqueId() and bootUniqueId().
+ - QThread:
+ * [QTBUG-53357] Changed how Qt thread priorities are mapped to QNX
+ system thread priorities.
+ - QUrl:
+ * Fixed a bug in parsing IPv6 addresses with more than 4 hex digits in a
+ component.
+ - QUuid:
+ * Added a parameter to both toString() and toByteArray() to allow
+ controlling the use or not of the braces and dashes in the string
+ form.
+ - QVarLengthArray:
+ * Added rvalue overloads of prepend and insert.
+ * QVarLengthArray can now contain movable but non-copyable types, such as
+ std::unique_ptr.
+ * Added missing rvalue overload of operator+=() and operator<<().
+ - QVariant:
+ * Conversions of QDateTime to strings now contain the millisecond
+ components.
+ - QVector:
+ * Added rvalue overloads of prepend and insert.
+ * Added missing rvalue overload of operator+=() and operator<<()
+ - [QTBUG-59762] The QT_QPA_PLATFORM environment variable and the -platform
+ argument now support a list of platform plugins in prioritized
+ order. Platforms are separated by semicolons.
+ - QGuiApplication:
+ * Added fontChanged() signal.
+ - QIcon:
+ * [QTBUG-33123] Added fallbackSearchPaths() that will be used to find
+ icons missing in the current icon theme.
+ - QStaticText:
+ * [QTBUG-65836] Fixed explicitly set width not being respected.
+ - Text:
+ * [QTBUG-45957] Fixed a bug where QStaticText would not use the
+ QPainter's pen color for text when other text colors were also in use.
+ Internally this reserves QColor(0, 0, 0, 0) for use with QStaticText.
+ * Added QFontMetrics::horizontalAdvance() and
+ QFontMetricsF::horizontalAdvance() to replace the confusingly named
+ width() function. The latter has now been deprecated.
+ * [QTBUG-65345] Fixed an issue where changing the letter spacing type of
+ a QTextCharFormat would not cause its font to update.
+ - QHostAddress:
+ * Added isGlobal(), isLinkLocal(), isSiteLocal(),
+ isUniqueLocalUnicast(), and isBroadcast() classification functions to
+ complement isLoopback() and isMulticast().
+ * Fixed a bug in parsing IPv6 addresses with more than 4 hex digits in a
+ component.
+- QNetworkAccessManager:
+ * [QTBUG-61397] Added Http2DirectAttribute to enable 'direct' HTTP/2
+ protocol without ALPN/NPN and without protocol upgrade negotiations.
+ * [QTBUG-66913] Fixed a crash in HTTP/2 protocol handler (when server
+ responds with redirect or some error status code early, not wating
+ for a stream to be closed on client side).
+ - QNetworkInterface:
+ * Added type().
+ * Added maximumTransmissionUnit().
+ * Added preferredLifetime() and validityLifetime() to
+ QNetworkAddressEntry that report the remaining lifetime of the address
+ in the network interface.
+ * Added dnsEligibility() to QNetworkAddressEntry to indicate whether the
+ address is eligible or not for publication in DNS or similar
+ mechanisms.
+ * [QTBUG-67226] Fixed a regression in reporting the local address of a
+ point-to-point tunnel network interface.
+ - QSslSocket:
+ * [QTBUG-67584] When using OpenSSL 1.1, it now correctly sets protocol
+ version for QSsl::TlsV1_0, QSsl::TlsV1_1 and QSsl::TlsV1_2.
+ * [QTBUG-67112] On WinRT QSsl::SecureProtocols (default) now enables
+ TLSv1.1 and TLSv1.2.
+ * On WinRT QSsl::TlsV1SslV3 now enables SSLv3 and not just TLSv1.
+ - Larger improvements to the CUPS print dialog.
+ * Added an advanced options tab in the printer properties, containing
+ all the printer options exposed through the CUPS API.
+ * Implemented support for installable options (add-ons to the printer).
+ * Added support for storing the selected settings between application runs.
+ * Added support for localized options in the advanced tab.
+ * The CUPS print dialog now supports printing of arbitrary ranges.
+ - QPrintDialog
+ * [QTBUG-58733] Fixed handling of custom page sizes.
+ - OCI support:
+ * [QTBUG-23] Added support for the TIMESTAMP data type.
+ - PostgreSQL support:
+ * [QTBUG-63714] Added support for forward-only queries (requires libpq
+ version 9.2 or later).
+ * Added support for multiple result sets.
+ - QSqlDatabase:
+ * [QTBUG-216] QSqlDatabase::database() will return an invalid
+ QSqlDatabase if the calling thread does not own the requested
+ QSqlDatabase.
+ - The qtest_global.h header is now deprecated. Include qttestglobal.h
+ instead.
+ - Added QAbstractItemModelTester, a class to help testing item models.
+ - [QTBUG-62094] QDesktopWidget has been deprecated. Use the corresponding
+ QScreen functions instead.
+ - [QTBUG-49374][QTBUG-65237][QTBUG-49374] Fixed several issues related
+ to HiDPI support in QStyle.
+ - Item views:
+ * [QTBUG-48725] QTreeView now calls canFetchMore() and fetchMore() when
+ the bottom of the QTreeView is scrolled to.
+ * [QTBUG-65082] Add ability to show QJsonValue::Bool/Double to
+ QTreeView, QTableView and QListView.
+ - QAbstractItemModel:
+ * Implemented improved support for the optional "role" parameter in the
+ "dataChanged" signal.
+ - QColorDialog:
+ * [QTBUG-64500] Fixed persistence of custom colors when relaunching an
+ application.
+ - QHeaderView:
+ * Flat treeviews can now allow the user to move the first column (like
+ in Qt 4.x) using the new method QHeaderView::setFirstSectionMovable().
+ * MinimumSectionSize/MaximumSectionSize is now respected when calling
+ resizeSection().
+ - QLineEdit:
+ * Implemented quick text selection by mouse in QLineEdit.
+ * Placeholder text is now used as accessible description if the latter
+ has not been set.
+ - QListView:
+ * QListView now honors css :first/:middle/:last Pseudo-States.
+ - QMenu:
+ * [QTBUG-25669] Fixed a bug in QMenu that caused QMenuBar::triggered() to
+ be fired multiple times.
+ - QMenuBar:
+ * Added overloads of addAction() using Qt 5 signals and slots.
+ - QStandardItemModel:
+ * [QTBUG-45114][QTBUG-10872] Fixed setItemData() incorrectly deleting
+ unmodified data. That behavior is not following QAbstractItemModel's
+ documented behavior which is no modification of data not provided in
+ parameter.
+ - QStyle:
+ * [QTBUG-53094] Added SH_ComboBox_AllowWheelScrolling as a style hint to
+ enable/disable the use of the mouse wheel in a QComboBox. This
+ defaults to true in all styles except the macOS one so there is no
+ change in existing behavior.
+ - QTextEdit/QPlainTextEdit
+ * [QTBUG-63868] context menus will now open on right mouse click even if
+ the focus policy is Qt::NoFcous (allowing text copy).
+ - QTreeWidgetItem:
+ * QTreeWidgetItem::insertChildren now ignores insertions happening at
+ invalid indices, for consistency with QTreeWidgetItem::insertChild.
+* Platform-specific Changes *
+ - The application and dependent Qt libraries are now loaded on the same
+ thread as main() is run on, ensuring that global static initializers,
+ constructor functions, and main() are all run on the same thread. The
+ same applies during application shutdown, for destructors of global
+ objects, and destructor functions.
+ - [QTBUG-63088] The DRM+GBM backend now exposes the DRM/GBM device handle
+ under the key "dri_fd", queriable via nativeResourceForIntegration().
+ - [QTBUG-56452] Added missing dead key symbols, enabling their use with
+ the "compose" input module.
+ - Added support for flatpak portals. Flatpak is a software utility for
+ software deployment and package management. It provides a sandbox
+ environment in which users can run applications in isolation from the
+ rest of the system. To communicate with the system flatpak uses portals,
+ which are designed to be a bridge between sandboxed applications and
+ desktop/system running on user's computer. Flatpak runs automatically
+ this as service, called xdg-desktop-portal, which exports portals on DBus
+ and which are by default visible to all applications running under
+ Flatpak.
+ - [QTBUG-44938] Qt now falls back to X11 core keycode information if an XKB
+ keymap could not be determined through the connection.
+ - ibus:
+ * Support ForwardKeyEvent signal
+ - [QTPM-487][QTBUG-53024][QTBUG-43190][QTBUG-61926][QTBUG-38499]
+ [QTBUG-38337][QTBUG-38501][QTBUG-38502][QTBUG-38504][QTBUG-38505]
+ [QTBUG-38507] The Windows Accessibility back end, formerly based on
+ Microsoft Active Accessibility, was replaced with a new implementation
+ based on Microsoft UI Automation.
+ - [QTBUG-44594] Added support for End-User Defined Characters in Qt.
+ - [QTBUG-59042] The Apple Pencil now generates QTabletEvents, with the
+ complete feature set (tilt, rotation, pressure).
+ - QMacStyle does no longer depend on HITheme — or Carbon for that matter.
+ Its implementation now relies exclusively on AppKit and custom code for
+ rendering and pixel metrics.
+* Tools *
+configure & build system
+ - [QTBUG-61260] Fixed build with -sanitize address.
+ - [QTBUG-61373][Windows] Restored default -prefix to C:\Qt\Qt-<version>\.
+ - [QTBUG-66355] pkg-config is now tried first to find system pcre2-16.
+ - [QTBUG-66675] Fixed -debug-and-release builds with qtquickcompiler.
+ - [Windows] OpenSSL 1.1 detection is now automatic.
+ - [X11] The -xkb-config-root command line switch has been removed as it
+ is no longer needed when configuring with -qt-xkbcommon-x11.
+ - Added the -gdb-index option to speed up debugging with GDB.
+ - More Qt features were made optional as part of the Qt Lite project.
+ - Removed compatibility of the modules with CMake < 3.1.
+ - [QTBUG-35131][Xcode] Fixed build breakage when an extra compiler's
+ output directory (OBJECTS_DIR, MOC_DIR, etc.) contains "/../".
+ - [QTBUG-45211][iOS] Fixed building of QML based test cases.
+ - [QTBUG-66265][VS2017] Fixed building projects with Windows 8.1 SDK.
+ - [QTBUG-66770][Android][x86] The clang makespec now adds -mstackrealign.
+ - [QTBUG-67011] Fixed immediate RESOURCES when using an absolute RCC_DIR.
+ - [QTBUG-67286][Darwin] Fixed error messages when SDK cannot be resolved.
+ - [Darwin] Fixed the selected SDK's compilers not being used for plain C
+ sources.
+ - [Darwin] Fixed QMAKE_BUNDLE_DATA with extra compiler generated files.
diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf
index 38e293db9e..e45ac94966 100644
--- a/mkspecs/features/qt_module_headers.prf
+++ b/mkspecs/features/qt_module_headers.prf
@@ -114,8 +114,6 @@ syncQtResolve(HEADER_FILES, $$_PRO_FILE_PWD_)
!lib_bundle: \ # Headers are embedded into the bundle, so don't install them separately.
CONFIG += qt_install_headers
@@ -128,8 +126,6 @@ exists($$OUT_PWD/qt$${MODULE}-config.h) {
$$fwd_rel/qt$${MODULE}-config.h:qt$${MODULE}-config.h \
for (injection, SYNCQT.INJECTIONS) {
@@ -142,6 +138,10 @@ for (injection, SYNCQT.INJECTIONS) {
write_file($$MAIN_FWD, MAIN_FWD_CONT)|error()
equals(fwd_hdr, ofwd_hdr): touch($$MAIN_FWD, $$dst_hdr)
+ !contains(ofwd_hdr, .*/private/.*): \
+ else: \
injects = $$member(injects, 2, -1)
for (inject, injects) {
@@ -149,6 +149,7 @@ for (injection, SYNCQT.INJECTIONS) {
write_file($$CLASS_FWD, CLASS_FWD_CONT)|error()
touch($$CLASS_FWD, $$MAIN_FWD)
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 21f22a32ba..2ca627e851 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -2856,7 +2856,7 @@ enum {
- \since 5.10
+ \since 5.11
Returns a unique ID for this machine, if one can be determined. If no
unique ID could be determined, this function returns an empty byte array.
@@ -2929,7 +2929,7 @@ QByteArray QSysInfo::machineUniqueId()
- \since 5.10
+ \since 5.11
Returns a unique ID for this machine's boot, if one can be determined. If
no unique ID could be determined, this function returns an empty byte
diff --git a/src/dbus/LIBDBUS-1-LICENSE.txt b/src/dbus/LIBDBUS-1-LICENSE.txt
new file mode 100644
index 0000000000..ff2c19be45
--- /dev/null
+++ b/src/dbus/LIBDBUS-1-LICENSE.txt
@@ -0,0 +1,157 @@
+Copyright (C) 2002, 2003 CodeFactory AB
+Copyright (C) 2004, 2005 Red Hat, Inc.
+Licensed under the Academic Free License version 2.1
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+The Academic Free License
+This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following notice immediately following the copyright notice for the Original Work:
+Licensed under the Academic Free License version 2.1
+ 1) Grant of Copyright License. Licensor hereby grants You a world-wide, royalty-free, non-exclusive, perpetual, sublicenseable license to do the following:
+ a) to reproduce the Original Work in copies;
+ b) to prepare derivative works ("Derivative Works") based upon the Original Work;
+ c) to distribute copies of the Original Work and Derivative Works to the public;
+ d) to perform the Original Work publicly; and
+ e) to display the Original Work publicly.
+ 2) Grant of Patent License. Licensor hereby grants You a world-wide, royalty-free, non-exclusive, perpetual, sublicenseable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, to make, use, sell and offer for sale the Original Work and Derivative Works.
+ 3) Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor hereby agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work, and by publishing the address of that information repository in a notice immediately following the copyright notice that applies to the Original Work.
+ 4) Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior written permission of the Licensor. Nothing in this License shall be deemed to grant any rights to trademarks, copyrights, patents, trade secrets or any other intellectual property of Licensor except as expressly stated herein. No patent license is granted to make, use, sell or offer to sell embodiments of any patent claims other than the licensed claims defined in Section 2. No right is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under different terms from this License any Original Work that Licensor otherwise would have a right to license.
+ 5) This section intentionally omitted.
+ 6) Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+ 7) Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately proceeding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to Original Work is granted hereunder except under this disclaimer.
+ 8) Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to any person for any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to liability for death or personal injury resulting from Licensor's negligence to the extent applicable law prohibits such limitation. Some jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so this exclusion and limitation may not apply to You.
+ 9) Acceptance and Termination. If You distribute copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. Nothing else but this License (or another written agreement between Licensor and You) grants You permission to create Derivative Works based upon the Original Work or to exercise any of the rights granted in Section 1 herein, and any attempt to do so except under the terms of this License (or another written agreement between Licensor and You) is expressly prohibited by U.S. copyright law, the equivalent laws of other countries, and by international treaty. Therefore, by exercising any of the rights granted to You in Section 1 herein, You indicate Your acceptance of this License and all of its terms and conditions.
+ 10) Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+ 11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of the U.S. Copyright Act, 17 U.S.C. § 101 et seq., the equivalent laws of other countries, and international treaty. This section shall survive the termination of this License.
+ 12) Attorneys Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+ 13) Miscellaneous. This License represents the complete agreement concerning the subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+ 14) Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For 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.
+ 15) Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+This license is Copyright (C) 2003-2004 Lawrence E. Rosen. All rights reserved.
+Permission is hereby granted to copy and distribute this license without modification. This license may not be modified without the express written permission of its copyright owner.
+Version 2, June 1991
+Copyright (C) 1989, 1991 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.
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too.
+When we speak of free software, we are referring to freedom, 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 or use pieces of it in new free programs; and that you know you can do these things.
+To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
+We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
+Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
+Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
+The precise terms and conditions for copying, distribution and modification follow.
+ 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
+ Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
+ 1. You may copy and distribute verbatim copies of the Program's 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 give any other recipients of the Program a copy of this License along with the Program.
+ 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 Program or any portion of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
+ b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
+ c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)
+ These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, 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 Program, 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 Program.
+ In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+ 3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
+ a) 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; or,
+ b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+ c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
+ The source code for a work means the preferred form of the work for making modifications to it. For an executable work, 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 executable. However, as a special exception, the source code 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.
+ If distribution of executable or 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 counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
+ 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program 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.
+ 5. 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 Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
+ 6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program 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 to this License.
+ 7. 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 Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program 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 Program.
+ 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.
+ 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program 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.
+ 9. The Free Software Foundation may publish revised and/or new versions of the 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 Program 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 Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
+ 10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, 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.
+How to Apply These Terms to Your New Programs
+If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
+To do so, attach the following notices to the program. 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 program's name and an idea of what it does.>
+Copyright (C) <yyyy> <name of author>
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+This program 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 General Public License for more details.
+You should have received a copy of the GNU General Public License along with this program; 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.
+If the program is interactive, make it output a short notice like this when it starts in an interactive mode:
+Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
+The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program.
+You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names:
+Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker.
+<signature of Ty Coon>, 1 April 1989 Ty Coon, President of Vice
diff --git a/src/dbus/doc/src/qtdbus-index.qdoc b/src/dbus/doc/src/qtdbus-index.qdoc
index eed5e42731..18a4aa6d0f 100644
--- a/src/dbus/doc/src/qtdbus-index.qdoc
+++ b/src/dbus/doc/src/qtdbus-index.qdoc
@@ -200,7 +200,7 @@
Information about the messages will be written to the console the application
was launched from.
- \section1 Licenses
+ \section1 Licenses and Attributions
The Qt D-Bus module is available under commercial licenses from \l{The Qt Company}.
In addition, it is available under free software licenses. Since Qt 5.4,
@@ -209,6 +209,11 @@
the \l{GNU General Public License, version 2}.
See \l{Qt Licensing} for further details.
+ Furthermore, Qt D-Bus in Qt \QtVersion may contain third party
+ modules under following permissive licenses:
+ \generatelist{groupsbymodule attributions-qtdbus}
\section1 Further Reading
The following documents contain information about Qt's D-Bus integration
diff --git a/src/dbus/qt_attribution.json b/src/dbus/qt_attribution.json
new file mode 100644
index 0000000000..52636ba89b
--- /dev/null
+++ b/src/dbus/qt_attribution.json
@@ -0,0 +1,15 @@
+ "Id": "libdbus-1-headers",
+ "Name": "libdus-1 headers",
+ "QDocModule": "qtdbus",
+ "QtUsage": "Qt D-Bus uses constants and typedefs from libdbus-1 headers.",
+ "Description": "D-Bus is a message bus system, a simple way for applications to talk to one another.",
+ "Homepage": "",
+ "LicenseId": "AFL-2.1 OR GPL-2.0-or-later",
+ "License": "Academic Free License v2.1, or GNU General Public License v2.0 or later",
+ "LicenseFile": "LIBDBUS-1-LICENSE.txt",
+ "Files": "dbus_minimal_p.h",
+ "Copyright": "Copyright (C) 2002, 2003 CodeFactory AB
+Copyright (C) 2004, 2005 Red Hat, Inc."
diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp
index 116a6693c4..1071662d96 100644
--- a/src/network/ssl/qsslconfiguration.cpp
+++ b/src/network/ssl/qsslconfiguration.cpp
@@ -876,7 +876,7 @@ void QSslConfiguration::setDiffieHellmanParameters(const QSslDiffieHellmanParame
Returns the backend-specific configuration.
- Only options set by addBackendConfiguration() or setBackendConfiguration() will be
+ Only options set by setBackendConfigurationOption() or setBackendConfiguration() will be
returned. The internal standard configuration of the backend is not reported.
\sa setBackendConfigurationOption(), setBackendConfiguration()
@@ -916,13 +916,13 @@ void QSslConfiguration::setBackendConfigurationOption(const QByteArray &name, co
Without a \a backendConfiguration parameter this function will clear the
backend-specific configuration. More information about the supported
- options is available in the documentation of addBackendConfiguration().
+ options is available in the documentation of setBackendConfigurationOption().
\sa backendConfiguration(), setBackendConfigurationOption()
-void QSslConfiguration::setBackendConfiguration(const QMap<QByteArray, QVariant> &backendConfig)
+void QSslConfiguration::setBackendConfiguration(const QMap<QByteArray, QVariant> &backendConfiguration)
- d->backendConfig = backendConfig;
+ d->backendConfig = backendConfiguration;
diff --git a/src/network/ssl/qsslconfiguration.h b/src/network/ssl/qsslconfiguration.h
index a5561d9828..fe4181d755 100644
--- a/src/network/ssl/qsslconfiguration.h
+++ b/src/network/ssl/qsslconfiguration.h
@@ -152,7 +152,7 @@ public:
QMap<QByteArray, QVariant> backendConfiguration() const;
void setBackendConfigurationOption(const QByteArray &name, const QVariant &value);
- void setBackendConfiguration(const QMap<QByteArray, QVariant> &backendConfig = QMap<QByteArray, QVariant>());
+ void setBackendConfiguration(const QMap<QByteArray, QVariant> &backendConfiguration = QMap<QByteArray, QVariant>());
static QSslConfiguration defaultConfiguration();
static void setDefaultConfiguration(const QSslConfiguration &configuration);
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
index baf3dbd42a..cc982b3379 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
@@ -90,10 +90,18 @@ typedef GLXContext (*glXCreateContextAttribsARBProc)(Display*, GLXFBConfig, GLXC
@@ -157,6 +165,11 @@ static void updateFormatFromContext(QSurfaceFormat &format)
if (format.renderableType() == QSurfaceFormat::OpenGL) {
+ GLint value = 0;
+ format.setOption(QSurfaceFormat::ResetNotification);
if (format.version() < qMakePair(3, 0)) {
@@ -164,7 +177,7 @@ static void updateFormatFromContext(QSurfaceFormat &format)
// Version 3.0 onwards - check if it includes deprecated functionality or is
// a debug context
- GLint value = 0;
+ value = 0;
glGetIntegerv(GL_CONTEXT_FLAGS, &value);
@@ -302,20 +315,17 @@ void QGLXContext::init(QXcbScreen *screen, QPlatformOpenGLContext *share)
- if (supportsRobustness && supportsVideoMemoryPurge && m_format.testOption(QSurfaceFormat::ResetNotification)) {
- QVector<int> contextAttributesWithNvidiaReset = contextAttributes;
- contextAttributesWithNvidiaReset << GLX_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV << GL_TRUE;
- contextAttributesWithNvidiaReset << None;
- m_context = glXCreateContextAttribsARB(m_display, config, m_shareContext, true,;
- if (!m_context && m_shareContext) {
- // re-try without a shared glx context
- m_context = glXCreateContextAttribsARB(m_display, config, 0, true,;
- if (m_context)
- m_shareContext = 0;
- }
+ if (supportsRobustness && m_format.testOption(QSurfaceFormat::ResetNotification)) {
+ QVector<int> contextAttributesWithRobustness = contextAttributes;
+ if (supportsVideoMemoryPurge)
+ contextAttributesWithRobustness << GLX_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV << GL_TRUE;
+ contextAttributesWithRobustness << None;
+ m_context = glXCreateContextAttribsARB(m_display, config, m_shareContext, true,
+ // Context creation against a shared context may fail specifically due to this request, so try
+ // without before dropping sharing.
if (m_context) {