diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-20 01:00:07 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-20 01:00:07 +0100 |
| commit | 87d9234d71122f0332c37c81ca0338ddcda7eeba (patch) | |
| tree | 3b92ae44963945225ec7d95284c4bda5bb1afeff | |
| parent | add46fd9055088e6aa458f21558234e267eb60ca (diff) | |
| parent | 9b5bd48fc652a7dd47c545db8338a580592f7f35 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I024445b3401a57040d7d67780ea32d2f8b02f41a
| -rw-r--r-- | src/qml/qml/qqmlimport.cpp | 5 | ||||
| -rw-r--r-- | src/qmlmodels/qqmladaptormodel.cpp | 2 | ||||
| -rw-r--r-- | src/quick/items/qquickpositioners.cpp | 1 | ||||
| -rw-r--r-- | src/quick/scenegraph/compressedtexture/qsgcompressedatlastexture.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/quick/qquickmousearea/BLACKLIST | 4 |
5 files changed, 11 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp index 3a06e98b6b..2a6a77a2fc 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp @@ -1994,8 +1994,11 @@ QString QQmlImportDatabase::resolvePlugin(QQmlTypeLoader *typeLoader, static const QStringList suffixes = { # ifdef QT_DEBUG QLatin1String("d.dll"), // try a qmake-style debug build first -# endif QLatin1String(".dll") +#else + QLatin1String(".dll"), + QLatin1String("d.dll") // try a qmake-style debug build after +# endif }; #elif defined(Q_OS_DARWIN) static const QString prefix = QLatin1String("lib"); diff --git a/src/qmlmodels/qqmladaptormodel.cpp b/src/qmlmodels/qqmladaptormodel.cpp index b4578db6c4..2126ad3dc5 100644 --- a/src/qmlmodels/qqmladaptormodel.cpp +++ b/src/qmlmodels/qqmladaptormodel.cpp @@ -460,7 +460,7 @@ public: void cleanup(QQmlAdaptorModel &) const override { - const_cast<VDMAbstractItemModelDataType *>(this)->release(); + release(); } QVariant value(const QQmlAdaptorModel &model, int index, const QString &role) const override diff --git a/src/quick/items/qquickpositioners.cpp b/src/quick/items/qquickpositioners.cpp index 512f59d799..65c48c583a 100644 --- a/src/quick/items/qquickpositioners.cpp +++ b/src/quick/items/qquickpositioners.cpp @@ -1609,6 +1609,7 @@ Qt::LayoutDirection QQuickGrid::effectiveLayoutDirection() const \qmlproperty enumeration QtQuick::Grid::horizontalItemAlignment \qmlproperty enumeration QtQuick::Grid::verticalItemAlignment \qmlproperty enumeration QtQuick::Grid::effectiveHorizontalItemAlignment + \since 5.1 Sets the horizontal and vertical alignment of items in the Grid. By default, the items are vertically aligned to the top. Horizontal diff --git a/src/quick/scenegraph/compressedtexture/qsgcompressedatlastexture.cpp b/src/quick/scenegraph/compressedtexture/qsgcompressedatlastexture.cpp index 46b2c6386c..e981921c69 100644 --- a/src/quick/scenegraph/compressedtexture/qsgcompressedatlastexture.cpp +++ b/src/quick/scenegraph/compressedtexture/qsgcompressedatlastexture.cpp @@ -151,7 +151,7 @@ Texture::~Texture() bool Texture::hasAlphaChannel() const { - return QSGCompressedTexture::formatIsOpaque(static_cast<Atlas*>(m_atlas)->format()); + return !QSGCompressedTexture::formatIsOpaque(static_cast<Atlas*>(m_atlas)->format()); } QSGTexture *Texture::removedFromAtlas() const diff --git a/tests/auto/quick/qquickmousearea/BLACKLIST b/tests/auto/quick/qquickmousearea/BLACKLIST index f2cb00225b..6e0665271c 100644 --- a/tests/auto/quick/qquickmousearea/BLACKLIST +++ b/tests/auto/quick/qquickmousearea/BLACKLIST @@ -2,3 +2,7 @@ [nestedStopAtBounds] opensuse-leap +# QTBUG-82282 +[pressOneAndTapAnother] +opensuse-leap + |