diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-07-01 12:33:16 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-07-01 13:21:29 +0200 |
| commit | 200fdd96f0aae9d2060cf3b8cb491eda10d6d68f (patch) | |
| tree | 80b3a1450c3fa8cbd44e07d82f6f5d3985a5902e /src/widgets/kernel/qwidget.cpp | |
| parent | cb260c6c7f1ebd4b3fa5f86c3d98ec8ff0486095 (diff) | |
| parent | e2665600c09358854bb0b29389cc873a2684f77b (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
configure
configure.json
Change-Id: Iba032d9a29c273da2585632bc6e22bbafb961808
Diffstat (limited to 'src/widgets/kernel/qwidget.cpp')
| -rw-r--r-- | src/widgets/kernel/qwidget.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 6fa74b7cc6..a71089793c 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -281,6 +281,7 @@ QWidgetPrivate::QWidgetPrivate(int version) #endif #ifndef QT_NO_OPENGL , renderToTextureReallyDirty(1) + , renderToTextureComposeActive(0) #endif #if defined(Q_OS_WIN) , noPaintOnScreen(0) |