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

Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"

Browse Source
This commit is contained in:
Liang Qi 2019-09-23 08:35:49 +02:00
commit 4f757e0757
5 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
qmake/doc/src/qmake-manual.qdoc
View File

@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
** Copyright (C) 2019 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
@ -2891,8 +2891,8 @@
On desktop Windows, the default value is the value of the environment
variable \c{WindowsSDKVersion}.
On WinRT, the default value is the value of the environment variable
\c{UCRTVERSION}.
On Universal Windows Platform (UWP), the default value is the value of the
environment variable \c{UCRTVERSION}.
\target WINDOWS_TARGET_PLATFORM_MIN_VERSION
\section1 WINDOWS_TARGET_PLATFORM_MIN_VERSION
@ -2905,8 +2905,8 @@
\target WINRT_MANIFEST
\section1 WINRT_MANIFEST
Specifies parameters to be passed to the application manifest on \l{Qt for WinRT}{Windows
Runtime}. The allowed values are:
Specifies parameters to be passed to the application manifest on
\l{Qt for UWP}{UWP}. The allowed values are:
\table
\header
@ -2941,7 +2941,6 @@
\row
\li foreground
\li Tile foreground (text) color. Defaults to \c{light}.
This option is only available for Windows Store apps on Windows 8 and Windows RT.
\row
\li iconic_tile_icon
\li Image file for the \c{iconic} tile template icon. Default provided by
@ -2956,16 +2955,16 @@
manifest's UUID, or generates a new UUID if none is present.
\row
\li logo_30x30
\li Logo image file of size 30x30 pixels. This is not supported on Windows Phone.
\li Logo image file of size 30x30 pixels.
\row
\li logo_41x41
\li Logo image file of size 41x41 pixels. This is only supported on Windows Phone.
\li Logo image file of size 41x41 pixels. This parameter is obsolete.
\row
\li logo_70x70
\li Logo image file of size 70x70 pixels. This is not supported on Windows Phone.
\li Logo image file of size 70x70 pixels.
\row
\li logo_71x71
\li Logo image file of size 71x71 pixels. This is only supported on Windows Phone.
\li Logo image file of size 71x71 pixels. This parameter is obsolete.
\row
\li logo_150x150
\li Logo image file of size 150x150 pixels. This is supported on all Windows
@ -2980,31 +2979,27 @@
Store App platforms.
\row
\li logo_620x300
\li Splash screen image file of size 620x300 pixels. This is not supported on
Windows Phone.
\li Splash screen image file of size 620x300 pixels.
\row
\li logo_480x800
\li Splash screen image file of size 480x800 pixels. This is only supported on
Windows Phone.
\li Splash screen image file of size 480x800 pixels.
This parameter is obsolete.
\row
\li logo_large
\li Large logo image file. This has to be 150x150 pixels. Supported on all
Windows Store App platforms. Default provided by the mkspec.
\row
\li logo_medium
\li Medium logo image file. For Windows Phone the image must have a pixel size
of 71x71, for other Windows Store App platforms 70x70. Default provided by
the mkspec.
\li Medium logo image file. The image must have a pixel size of 70x70.
Default provided by the mkspec.
\row
\li logo_small
\li Small logo image file. For Windows Phone the image must have a pixel size
of 44x44, for other Windows Store App platforms 30x30. Default provided by
the mkspec.
\li Small logo image file. The image must have a pixel size of 30x30.
Default provided by the mkspec.
\row
\li logo_splash
\li Splash screen image file. For Windows Phone the image must have a pixel size
of 480x800, for other Windows Store App platforms 620x300. Default provided
by the mkspec.
\li Splash screen image file. The image must have a pixel size of
620x300. Default provided by the mkspec.
\row
\li logo_store
\li Logo image file for Windows Store. Default provided by the mkspec.
@ -3017,10 +3012,12 @@
\li The name of the package as displayed to the user. Defaults to TARGET.
\row
\li phone_product_id
\li The GUID of the product. Defaults to the value of WINRT_MANIFEST.identity. (Windows Phone only)
\li The GUID of the product.
This parameter is obsolete.
\row
\li phone_publisher_id
\li The GUID of the publisher. Defaults to an invalid GUID. (Windows Phone only)
\li The GUID of the publisher.
This parameter is obsolete.
\row
\li publisher
\li Display name of the publisher. Defaults to \c{Default publisher display name}.
@ -3071,10 +3068,6 @@
WINRT_MANIFEST.CONFIG += verbatim
\endcode
\note The required image sizes of \e logo_small, \e logo_medium, and \e logo_large
depend on the target platform. The general descriptions are overwritten if a
description that specifies the size is provided.
\target YACCSOURCES
\section1 YACCSOURCES

12
src/corelib/kernel/qobject.cpp
View File

@ -4399,22 +4399,18 @@ QDebug operator<<(QDebug dbg, const QObject *o)
\relates QObject
\obsolete
In new code, you should prefer the use of the Q_ENUM() macro, which makes the
type available also to the meta type system.
For instance, QMetaEnum::fromType() will not work with types declared with Q_ENUMS().
This macro registers one or several enum types to the meta-object
system.
For example:
\snippet code/src_corelib_kernel_qobject.cpp 38
If you want to register an enum that is declared in another class,
the enum must be fully qualified with the name of the class
defining it. In addition, the class \e defining the enum has to
inherit QObject as well as declare the enum using Q_ENUMS().
In new code, you should prefer the use of the Q_ENUM() macro, which makes the
type available also to the meta type system.
For instance, QMetaEnum::fromType() will not work with types declared with Q_ENUMS().
\sa {Qt's Property System}
*/

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

@ -1716,8 +1716,8 @@ void QPainter::restore()
static inline void qt_cleanup_painter_state(QPainterPrivate *d)
{
qDeleteAll(d->states);
d->states.clear();
delete d->state;
d->state = 0;
d->engine = 0;
d->device = 0;

8
src/sql/kernel/qsqldatabase.cpp
View File

@ -881,6 +881,14 @@ bool QSqlDatabase::rollback()
connection name must be passed to addDatabase() at connection
object create time.
For the QSQLITE driver, if the database name specified does not
exist, then it will create the file for you unless the
QSQLITE_OPEN_READONLY option is set.
Additionally, \a name can be set to \c ":memory:" which will
create a temporary database which is only available for the
lifetime of the application.
For the QOCI (Oracle) driver, the database name is the TNS
Service Name.

5
src/widgets/styles/qstylesheetstyle.cpp
View File

@ -2735,6 +2735,11 @@ static void updateObjects(const QList<const QObject *>& objects)
if (auto widget = qobject_cast<QWidget*>(const_cast<QObject*>(object))) {
widget->style()->polish(widget);
QCoreApplication::sendEvent(widget, &event);
QList<const QObject *> children;
children.reserve(widget->children().size() + 1);
for (auto child: qAsConst(widget->children()))
children.append(child);
updateObjects(children);
}
}
}