qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Qt Forward Merge Bot 2019-07-12 01:01:11 +02:00 committed by Simon Hausmann
parent 83f8d886ce d389fe0392
commit a6057b46ee
13 changed files with 90 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/qml/doc/qtqml.qdocconf
View File

@ -1,4 +1,5 @@
include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
include($QT_INSTALL_DOCS/config/exampleurl-qtdeclarative.qdocconf)
project = QtQml
description = Qt QML Reference Documentation

12
src/qml/qml/qqmlcomponent.cpp
View File

@ -569,6 +569,12 @@ void QQmlComponent::setData(const QByteArray &data, const QUrl &url)
{
Q_D(QQmlComponent);
if (!d->engine) {
// ###Qt6: In Qt 6, it should be impossible for users to create a QQmlComponent without an engine, and we can remove this check
qWarning("QQmlComponent: Must provide an engine before calling setData");
return;
}
d->clear();
d->url = url;
@ -774,6 +780,12 @@ QObject *QQmlComponent::create(QQmlContext *context)
{
Q_D(QQmlComponent);
if (!d->engine) {
// ###Qt6: In Qt 6, it should be impossible for users to create a QQmlComponent without an engine, and we can remove this check
qWarning("QQmlComponent: Must provide an engine before calling create");
return nullptr;
}
if (!context)
context = d->engine->rootContext();

6
src/qml/qml/qqmltypeloader.cpp
View File

@ -625,7 +625,11 @@ bool QQmlTypeLoader::Blob::addImport(const QV4::CompiledData::Import *import, QL
bool incomplete = false;
QUrl qmldirUrl = finalUrl().resolved(QUrl(importUri + QLatin1String("/qmldir")));
QUrl importUrl(importUri);
QString path = importUrl.path();
path.append(QLatin1String(path.endsWith(QLatin1Char('/')) ? "qmldir" : "/qmldir"));
importUrl.setPath(path);
QUrl qmldirUrl = finalUrl().resolved(importUrl);
if (!QQmlImports::isLocal(qmldirUrl)) {
// This is a remote file; the import is currently incomplete
incomplete = true;

10
src/qmlmodels/qqmladaptormodel.cpp
View File

@ -161,8 +161,14 @@ public:
signalIndexes.append(propertyId + signalOffset);
}
for (int i = 0, c = items.count(); i < c; ++i) {
QQmlDelegateModelItem *item = items.at(i);
QVarLengthArray<QQmlGuard<QQmlDelegateModelItem>> guardedItems;
for (const auto item : items)
guardedItems.append(item);
for (const auto &item : qAsConst(guardedItems)) {
if (item.isNull())
continue;
const int idx = item->modelIndex();
if (idx >= index && idx < index + count) {
for (int i = 0; i < signalIndexes.count(); ++i)

1
src/qmltest/doc/qtqmltest.qdocconf
View File

@ -1,4 +1,5 @@
include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
include($QT_INSTALL_DOCS/config/exampleurl-qtdeclarative.qdocconf)
project = QtQmlTest
description = Qt Quick Test Reference Documentation

1
src/quick/doc/qtquick.qdocconf
View File

@ -1,4 +1,5 @@
include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
include($QT_INSTALL_DOCS/config/exampleurl-qtdeclarative.qdocconf)
project = QtQuick
description = Qt Quick Reference Documentation

2
src/quick/doc/src/concepts/effects/sprites.qdoc
View File

@ -144,7 +144,7 @@ these situations, a warning will be output to the console containing the maximum
There are several tools to help turn a set of images into sprite sheets. Here are some examples:
\list
\li Photoshop plugin: \l http://www.johnwordsworth.com/projects/photoshop-sprite-sheet-generator-script
\li Gimp plugin: \l http://registry.gimp.org/node/20943
\li Gimp's SpriteSheet plugin
\li Cmd-line tool: \l http://www.imagemagick.org/script/montage.php
\endlist

40
src/quick/scenegraph/qsgopengldistancefieldglyphcache.cpp
View File

@ -69,7 +69,8 @@ DEFINE_BOOL_CONFIG_OPTION(qsgPreferFullSizeGlyphCacheTextures, QSG_PREFER_FULLSI
QSGOpenGLDistanceFieldGlyphCache::QSGOpenGLDistanceFieldGlyphCache(QOpenGLContext *c,
const QRawFont &font)
: QSGDistanceFieldGlyphCache(font)
, m_maxTextureSize(0)
, m_maxTextureWidth(0)
, m_maxTextureHeight(0)
, m_maxTextureCount(3)
, m_areaAllocator(nullptr)
, m_blitProgram(nullptr)
@ -113,13 +114,23 @@ void QSGOpenGLDistanceFieldGlyphCache::requestGlyphs(const QSet<glyph_t> &glyphs
QList<GlyphPosition> glyphPositions;
QVector<glyph_t> glyphsToRender;
const int padding = QSG_OPENGL_DISTANCEFIELD_GLYPH_CACHE_PADDING;
const qreal scaleFactor = qreal(1) / QT_DISTANCEFIELD_SCALE(m_doubleGlyphResolution);
if (m_maxTextureHeight == 0) {
m_funcs->glGetIntegerv(GL_MAX_TEXTURE_SIZE, &m_maxTextureWidth);
// We need to add a buffer to avoid glyphs that overlap the border between two
// textures causing the height of the textures to extend beyond the limit.
m_maxTextureHeight = m_maxTextureWidth - (qCeil(m_referenceFont.pixelSize() * scaleFactor) + distanceFieldRadius() * 2 + padding * 2);
}
if (m_areaAllocator == nullptr)
m_areaAllocator = new QSGAreaAllocator(QSize(maxTextureSize(), m_maxTextureCount * maxTextureSize()));
m_areaAllocator = new QSGAreaAllocator(QSize(m_maxTextureWidth, m_maxTextureCount * m_maxTextureHeight));
for (QSet<glyph_t>::const_iterator it = glyphs.constBegin(); it != glyphs.constEnd() ; ++it) {
glyph_t glyphIndex = *it;
int padding = QSG_OPENGL_DISTANCEFIELD_GLYPH_CACHE_PADDING;
QRectF boundingRect = glyphData(glyphIndex).boundingRect;
int glyphWidth = qCeil(boundingRect.width()) + distanceFieldRadius() * 2;
int glyphHeight = qCeil(boundingRect.height()) + distanceFieldRadius() * 2;
@ -152,8 +163,8 @@ void QSGOpenGLDistanceFieldGlyphCache::requestGlyphs(const QSet<glyph_t> &glyphs
continue;
}
TextureInfo *tex = textureInfo(alloc.y() / maxTextureSize());
alloc = QRect(alloc.x(), alloc.y() % maxTextureSize(), alloc.width(), alloc.height());
TextureInfo *tex = textureInfo(alloc.y() / m_maxTextureHeight);
alloc = QRect(alloc.x(), alloc.y() % m_maxTextureHeight, alloc.width(), alloc.height());
tex->allocatedArea |= alloc;
Q_ASSERT(tex->padding == padding || tex->padding < 0);
@ -541,13 +552,6 @@ bool QSGOpenGLDistanceFieldGlyphCache::createFullSizeTextures() const
return qsgPreferFullSizeGlyphCacheTextures() && glyphCount() > QT_DISTANCEFIELD_HIGHGLYPHCOUNT();
}
int QSGOpenGLDistanceFieldGlyphCache::maxTextureSize() const
{
if (!m_maxTextureSize)
m_funcs->glGetIntegerv(GL_MAX_TEXTURE_SIZE, &m_maxTextureSize);
return m_maxTextureSize;
}
namespace {
struct Qtdf {
// We need these structs to be tightly packed, but some compilers we use do not
@ -646,7 +650,7 @@ bool QSGOpenGLDistanceFieldGlyphCache::loadPregeneratedCache(const QRawFont &fon
}
qreal pixelSize = qreal(Qtdf::fetch<quint16>(qtdfTableStart, Qtdf::pixelSize));
m_maxTextureSize = Qtdf::fetch<quint32>(qtdfTableStart, Qtdf::textureSize);
m_maxTextureWidth = m_maxTextureHeight = Qtdf::fetch<quint32>(qtdfTableStart, Qtdf::textureSize);
m_doubleGlyphResolution = Qtdf::fetch<quint8>(qtdfTableStart, Qtdf::flags) == 1;
padding = Qtdf::fetch<quint8>(qtdfTableStart, Qtdf::headerPadding);
@ -655,7 +659,7 @@ bool QSGOpenGLDistanceFieldGlyphCache::loadPregeneratedCache(const QRawFont &fon
return false;
}
if (m_maxTextureSize <= 0) {
if (m_maxTextureWidth <= 0) {
qWarning("Invalid texture size in '%s'", qPrintable(font.familyName()));
return false;
}
@ -663,11 +667,11 @@ bool QSGOpenGLDistanceFieldGlyphCache::loadPregeneratedCache(const QRawFont &fon
int systemMaxTextureSize;
m_funcs->glGetIntegerv(GL_MAX_TEXTURE_SIZE, &systemMaxTextureSize);
if (m_maxTextureSize > systemMaxTextureSize) {
if (m_maxTextureWidth > systemMaxTextureSize) {
qWarning("System maximum texture size is %d. This is lower than the value in '%s', which is %d",
systemMaxTextureSize,
qPrintable(font.familyName()),
m_maxTextureSize);
m_maxTextureWidth);
}
if (padding != QSG_OPENGL_DISTANCEFIELD_GLYPH_CACHE_PADDING) {
@ -690,12 +694,12 @@ bool QSGOpenGLDistanceFieldGlyphCache::loadPregeneratedCache(const QRawFont &fon
return false;
}
if (m_areaAllocator->size().height() % m_maxTextureSize != 0) {
if (m_areaAllocator->size().height() % m_maxTextureHeight != 0) {
qWarning("Area allocator size mismatch in '%s'", qPrintable(font.familyName()));
return false;
}
textureCount = m_areaAllocator->size().height() / m_maxTextureSize;
textureCount = m_areaAllocator->size().height() / m_maxTextureHeight;
m_maxTextureCount = qMax(m_maxTextureCount, textureCount);
const char *textureRecord = allocatorData;

9
src/quick/scenegraph/qsgopengldistancefieldglyphcache_p.h
View File

@ -80,7 +80,6 @@ public:
bool useTextureResizeWorkaround() const;
bool useTextureUploadWorkaround() const;
bool createFullSizeTextures() const;
int maxTextureSize() const;
void setMaxTextureCount(int max) { m_maxTextureCount = max; }
int maxTextureCount() const { return m_maxTextureCount; }
@ -98,7 +97,7 @@ private:
QDistanceField image;
int padding = -1;
TextureInfo(const QRect &preallocRect = QRect()) : texture(0), allocatedArea(preallocRect) { }
TextureInfo(const QRect &preallocRect = QRect(0, 0, 1, 1)) : texture(0), allocatedArea(preallocRect) { }
};
void createTexture(TextureInfo * texInfo, int width, int height, const void *pixels);
@ -107,9 +106,10 @@ private:
TextureInfo *textureInfo(int index)
{
Q_ASSERT(m_maxTextureWidth > 0 && m_maxTextureHeight > 0);
for (int i = m_textures.count(); i <= index; ++i) {
if (createFullSizeTextures())
m_textures.append(QRect(0, 0, maxTextureSize(), maxTextureSize()));
m_textures.append(QRect(0, 0, m_maxTextureWidth, m_maxTextureWidth));
else
m_textures.append(TextureInfo());
}
@ -137,7 +137,8 @@ private:
m_blitProgram->link();
}
mutable int m_maxTextureSize;
int m_maxTextureWidth;
int m_maxTextureHeight;
int m_maxTextureCount;
bool m_coreProfile;

12
tests/auto/qml/qqmlcomponent/tst_qqmlcomponent.cpp
View File

@ -120,6 +120,7 @@ private slots:
void setNonExistentInitialProperty();
void relativeUrl_data();
void relativeUrl();
void setDataNoEngineNoSegfault();
private:
QQmlEngine engine;
@ -655,6 +656,17 @@ void tst_qqmlcomponent::relativeUrl()
QVERIFY2(!component.isError(), qPrintable(component.errorString()));
}
void tst_qqmlcomponent::setDataNoEngineNoSegfault()
{
QQmlEngine eng;
QQmlComponent comp;
QTest::ignoreMessage(QtWarningMsg, "QQmlComponent: Must provide an engine before calling setData");
comp.setData("import QtQuick 1.0; QtObject { }", QUrl(""));
QTest::ignoreMessage(QtWarningMsg, "QQmlComponent: Must provide an engine before calling create");
auto c = comp.create();
QVERIFY(!c);
}
QTEST_MAIN(tst_qqmlcomponent)
#include "tst_qqmlcomponent.moc"

4
tests/auto/qml/qqmltypeloader/data/qrcRootPath.qml Normal file
View File

@ -0,0 +1,4 @@
import QtQml 2.12
import "qrc:/"
QtObject {}

8
tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp
View File

@ -58,6 +58,7 @@ private slots:
void qmlSingletonWithinModule();
void multiSingletonModule();
void implicitComponentModule();
void qrcRootPathUrl();
};
void tst_QQMLTypeLoader::testLoadComplete()
@ -505,6 +506,13 @@ void tst_QQMLTypeLoader::implicitComponentModule()
checkCleanCacheLoad(QLatin1String("implicitComponentModule"));
}
void tst_QQMLTypeLoader::qrcRootPathUrl()
{
QQmlEngine engine;
QQmlComponent component(&engine, testFileUrl("qrcRootPath.qml"));
QCOMPARE(component.status(), QQmlComponent::Ready);
}
QTEST_MAIN(tst_QQMLTypeLoader)
#include "tst_qqmltypeloader.moc"

10
tools/qmlcachegen/qtquickcompiler.prf
View File

@ -1,5 +1,15 @@
if(qtc_run|lupdate_run): return()
!contains(QT, qml) {
qt_modules = \
$$replace(QT, -private$, _private) \
$$replace(QT_PRIVATE, -private$, _private)
qt_modules = $$resolve_depends(qt_modules, "QT.", ".depends" ".run_depends")
!contains(qt_modules, qml): \
error("The qtquickcompiler feature cannot be used without the QML module.")
unset(qt_modules)
}
qtPrepareTool(QML_CACHEGEN, qmlcachegen, _FILTER)
qtPrepareTool(QMAKE_RCC, rcc, _DEP)