summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-09-16 08:57:59 +0200
committerLiang Qi <liang.qi@qt.io>2016-09-16 08:58:07 +0200
commita273a0ad9c1df7aed612ee6353753f668d545076 (patch)
tree229f361813dd4ba268e7914e5b00a6e664ced5a4 /src
parent4e6c5eade5504b335e31bd0950b9a702f8db58e7 (diff)
parentc1d726fe19c83cf081042e55ace9d9d7b31c40e6 (diff)
Merge remote-tracking branch 'origin/5.6.2' into 5.6
Diffstat (limited to 'src')
-rw-r--r--src/qml/qml.pro4
-rw-r--r--src/quick/scenegraph/util/qsgdefaultpainternode.cpp4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/qml/qml.pro b/src/qml/qml.pro
index 651afa6b75..7c9eef6df1 100644
--- a/src/qml/qml.pro
+++ b/src/qml/qml.pro
@@ -21,6 +21,10 @@ greaterThan(QT_GCC_MAJOR_VERSION, 5) {
QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks -fno-lifetime-dse
}
+# QTBUG-55238, disable new optimizer for MSVC 2015/Update 3.
+release:win32-msvc*:equals(QT_CL_MAJOR_VERSION, 19):equals(QT_CL_MINOR_VERSION, 00): \
+ greaterThan(QT_CL_PATCH_VERSION, 24212):QMAKE_CXXFLAGS += -d2SSAOptimizer-
+
QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf
# 2415: variable "xx" of static storage duration was declared but never referenced
diff --git a/src/quick/scenegraph/util/qsgdefaultpainternode.cpp b/src/quick/scenegraph/util/qsgdefaultpainternode.cpp
index e3103341cd..7a92d61016 100644
--- a/src/quick/scenegraph/util/qsgdefaultpainternode.cpp
+++ b/src/quick/scenegraph/util/qsgdefaultpainternode.cpp
@@ -218,7 +218,7 @@ void QSGDefaultPainterNode::updateGeometry()
if (m_actualRenderTarget == QQuickPaintedItem::Image)
source = QRectF(0, 0, 1, 1);
else
- source = QRectF(0, 0, qreal(m_size.width()) / m_fboSize.width(), qreal(m_size.height()) / m_fboSize.height());
+ source = QRectF(0, 0, qreal(m_textureSize.width()) / m_fboSize.width(), qreal(m_textureSize.height()) / m_fboSize.height());
QRectF dest(0, 0, m_size.width(), m_size.height());
if (m_actualRenderTarget == QQuickPaintedItem::InvertedYFramebufferObject)
dest = QRectF(QPointF(0, m_size.height()), QPointF(m_size.width(), 0));
@@ -300,7 +300,7 @@ void QSGDefaultPainterNode::updateRenderTarget()
QSGPainterTexture *texture = new QSGPainterTexture;
if (m_actualRenderTarget == QQuickPaintedItem::Image) {
texture->setOwnsTexture(true);
- texture->setTextureSize(m_size);
+ texture->setTextureSize(m_textureSize);
} else {
texture->setTextureId(m_fbo->texture());
texture->setOwnsTexture(false);