AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.13' into dev

Browse Source 
Change-Id: Icaabf08f9af539ddf844d96bc9c3a2d09408ba8a
This commit is contained in:
Qt Forward Merge Bot 2019-07-12 01:00:42 +02:00
commit fd2d9de51e
17 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/syncqt.pl
View File

@ -1092,7 +1092,7 @@ foreach my $lib (@modules_to_sync) {
# }
my $class_header = "$class ";
$pri_install_gfiles .= $class_header
unless ($shadow || $pri_install_gfiles =~ $class_header);
unless ($shadow || $pri_install_gfiles =~ m/\b$class_header/);
$injection .= ":$class";
}

2
mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
View File

@ -75,7 +75,7 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
# Handle normal libraries passed as -lfoo
set(_lib \"${CMAKE_MATCH_1}\")
foreach(_standard_library ${_standard_libraries})
if(_standard_library MATCHES \"^${_lib}(\\.lib)?$\")
if(_standard_library MATCHES \"^${_lib}(\\\\.lib)?$\")
set(_lib_is_default_linked TRUE)
break()
endif()

4
src/corelib/global/qt_pch.h
View File

@ -55,6 +55,10 @@
#include <stdlib.h>
#include <qglobal.h>
#ifdef Q_OS_WIN
# ifdef Q_CC_MINGW
// <unistd.h> must be included before any other header pulls in <time.h>.
# include <unistd.h> // Define _POSIX_THREAD_SAFE_FUNCTIONS to obtain localtime_r()
# endif
# define _POSIX_
# include <limits.h>
# undef _POSIX_

2
src/corelib/kernel/qvariant.h
View File

@ -362,7 +362,7 @@ class Q_CORE_EXPORT QVariant
static inline QVariant fromValue(const T &value)
{ return QVariant(qMetaTypeId<T>(), &value, QTypeInfo<T>::isPointer); }
#if QT_HAS_INCLUDE(<variant>) && __cplusplus >= 201703L
#if (QT_HAS_INCLUDE(<variant>) && __cplusplus >= 201703L) || defined(Q_CLANG_QDOC)
template<typename... Types>
static inline QVariant fromStdVariant(const std::variant<Types...> &value)
{

2
src/corelib/plugin/qpluginloader.cpp
View File

@ -92,7 +92,7 @@ QT_BEGIN_NAMESPACE
but if other instances of QPluginLoader are using the same
library, the call will fail, and unloading will only happen when
every instance has called unload(). Right before the unloading
happen, the root component will also be deleted.
happens, the root component will also be deleted.
See \l{How to Create Qt Plugins} for more information about
how to make your application extensible through plugins.

6
src/corelib/serialization/qcborarray.cpp
View File

@ -273,7 +273,7 @@ QCborValue QCborArray::at(qsizetype i) const
not be empty.
QCborValueRef has the exact same API as \l QCborValue, with one important
difference: if you assign new values to it, this map will be updated with
difference: if you assign new values to it, this array will be updated with
that new value.
\sa operator[](), at(), last(), insert(), prepend(), append(),
@ -287,7 +287,7 @@ QCborValue QCborArray::at(qsizetype i) const
not be empty.
QCborValueRef has the exact same API as \l QCborValue, with one important
difference: if you assign new values to it, this map will be updated with
difference: if you assign new values to it, this array will be updated with
that new value.
\sa operator[](), at(), first(), insert(), prepend(), append(),
@ -302,7 +302,7 @@ QCborValue QCborArray::at(qsizetype i) const
with undefined entries, until it has an entry at the specified index.
QCborValueRef has the exact same API as \l QCborValue, with one important
difference: if you assign new values to it, this map will be updated with
difference: if you assign new values to it, this array will be updated with
that new value.
\sa at(), first(), last(), insert(), prepend(), append(),

2
src/corelib/serialization/qjsonarray.cpp
View File

@ -845,7 +845,7 @@ bool QJsonArray::operator!=(const QJsonArray &other) const
The return value is of type QJsonValueRef, a helper class for QJsonArray
and QJsonObject. When you get an object of type QJsonValueRef, you can
use it as if it were a reference to a QJsonValue. If you assign to it,
the assignment will apply to the character in the QJsonArray of QJsonObject
the assignment will apply to the element in the QJsonArray or QJsonObject
from which you got the reference.
\sa operator+()

2
src/corelib/serialization/qjsoncbor.cpp
View File

@ -421,7 +421,7 @@ QJsonArray QCborArray::toJsonArray() const
}
/*!
Recursively converts every \l QCborValue value in this array to JSON using
Recursively converts every \l QCborValue value in this map to JSON using
QCborValue::toJsonValue() and creates a string key for all keys that aren't
strings, then returns the corresponding QJsonObject composed of those
associations.

4
src/corelib/text/qstring.cpp
View File

@ -2091,7 +2091,7 @@ int QString::toUcs4_helper(const ushort *uc, int length, uint *out)
If \a size is negative, \a unicode is assumed to point to a \\0'-terminated
array and its length is determined dynamically. The terminating
nul-character is not considered part of the string.
null character is not considered part of the string.
QString makes a deep copy of the string data. The unicode data is copied as
is and the Byte Order Mark is preserved if present.
@ -5769,7 +5769,7 @@ QString QString::trimmed_helper(QString &str)
The return value is of type QCharRef, a helper class for QString.
When you get an object of type QCharRef, you can use it as if it
were a QChar &. If you assign to it, the assignment will apply to
were a reference to a QChar. If you assign to it, the assignment will apply to
the character in the QString from which you got the reference.
\note Before Qt 5.14 it was possible to use this operator to access

4
src/corelib/tools/qalgorithms.qdoc
View File

@ -155,8 +155,8 @@
\section2 Porting guidelines
Most of the times, an application using the deprecated Qt algorithmic functions
can be easily ported to use the equivalent STL functions. You need to
Most of the time, an application using the deprecated Qt algorithmic functions
can be easily ported to use the equivalent STL functions. You need to:
\list 1
\li add the \c{#include <algorithm>} preprocessor directive;

2
src/gui/painting/qpagedpaintdevice.cpp
View File

@ -85,7 +85,7 @@ QPagedPaintDevicePrivate::~QPagedPaintDevicePrivate()
\class QPagedPaintDevice
\inmodule QtGui
\brief The QPagedPaintDevice class is a represents a paintdevice that supports
\brief The QPagedPaintDevice class represents a paint device that supports
multiple pages.
\ingroup painting

2
src/widgets/dialogs/qfontdialog.cpp
View File

@ -163,7 +163,7 @@ QFontDialog::QFontDialog(QWidget *parent)
\since 4.5
Constructs a standard font dialog with the given \a parent and specified
\a initial color.
\a initial font.
*/
QFontDialog::QFontDialog(const QFont &initial, QWidget *parent)
: QFontDialog(parent)

2
src/widgets/doc/src/widgets-and-layouts/layout.qdoc
View File

@ -220,7 +220,7 @@
When you make your own widget class, you should also communicate its layout
properties. If the widget uses one of Qt's layouts, this is already taken
care of. If the widget does not have any child widgets, or uses manual
care of. If the widget does not have any child widgets, or uses a manual
layout, you can change the behavior of the widget using any or all of the
following mechanisms:

2
src/widgets/graphicsview/qgraphicsscene.cpp
View File

@ -2805,7 +2805,7 @@ QGraphicsPolygonItem *QGraphicsScene::addPolygon(const QPolygonF &polygon,
Note that the item's geometry is provided in item coordinates, and its
position is initialized to (0, 0). For example, if a QRect(50, 50, 100,
100) is added, its top-left corner will be at (50, 50) relative to the
origin in the items coordinate system.
origin in the item's coordinate system.
If the item is visible (i.e., QGraphicsItem::isVisible() returns \c true),
QGraphicsScene will emit changed() once control goes back to the event

2
src/widgets/widgets/qcombobox.cpp
View File

@ -2623,7 +2623,7 @@ bool QComboBoxPrivate::showNativePopup()
/*!
Displays the list of items in the combobox. If the list is empty
then the no items will be shown.
then no items will be shown.
If you reimplement this function to show a custom pop-up, make
sure you call hidePopup() to reset the internal state.

2
src/widgets/widgets/qcommandlinkbutton.cpp
View File

@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
\ingroup basicwidgets
\inmodule QtWidgets
The command link is a new control that was introduced by Windows Vista. It's
The command link is a new control that was introduced by Windows Vista. Its
intended use is similar to that of a radio button in that it is used to choose
between a set of mutually exclusive options. Command link buttons should not
be used by themselves but rather as an alternative to radio buttons in

6
tests/libfuzzer/README
View File

@ -7,7 +7,7 @@ of the test and track the code execution. Should the test crash, libFuzzer will
data which triggered the crash. You can then use this to debug and fix the called code.
! Please note: The purpose of fuzz testing is to find unexpected code paths. Running fuzz tests may!
! result in unforeseen bevavior, including loss of data. Consider running the tests in an isolated !
! result in unforeseen behavior, including loss of data. Consider running the tests in an isolated !
! environment, e.g. on a virtual machine. You have been warned. !
To run a test with libFuzzer:
@ -21,7 +21,7 @@ To run a test with libFuzzer:
to add the needed code coverage instrumentation. Since speed of execution is crucial for fuzz
testing, it's recommendable to also use the switches
-release -static
It might also make sense to add sanitzers by passing
It might also make sense to add sanitizers by passing
-sanitize <...>
4. Build Qt.
5. Build one of the tests using this Qt build.
@ -29,7 +29,7 @@ To run a test with libFuzzer:
Depending on the expected input format of the tested function, you will get results faster if
you:
* provide a set of interesting input data by passing the path of a directory which contains
these data, each in one file. You can find such datasets in the subdirectory "testcases".
these data, each in one file. You can find such data sets in the subdirectory "testcases".
* pass a so-called dictionary listing keywords of the input format using
-dict=<dictionary file>
A couple of such dictionaries are provided by AFL (http://lcamtuf.coredump.cx/afl/)