diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-05-07 13:07:34 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-05-07 13:08:18 +0200 |
| commit | d1ea4813458b383e66ce4df69d1833b8b6a279c4 (patch) | |
| tree | 3bdc16da993e5de56b669e6774fb0748075ddd90 /examples | |
| parent | 1c87d4e1a1d0e1972f6dc85e55ea9be8a42797ba (diff) | |
| parent | 0b1ec78c2d4871afcc89d5b046926b88f0819a7c (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/network/access/qnetworkreply.cpp
tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
Change-Id: Iadf766269454087e69fb216fc3857d85b0ddfaad
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/gui/gui.pro | 2 | ||||
| -rw-r--r-- | examples/gui/rasterwindow/rasterwindow.cpp | 5 | ||||
| -rw-r--r-- | examples/widgets/widgets.pro | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/examples/gui/gui.pro b/examples/gui/gui.pro index a4d960d3f5..b8080c2075 100644 --- a/examples/gui/gui.pro +++ b/examples/gui/gui.pro @@ -6,5 +6,5 @@ CONFIG += no_docs_target SUBDIRS += analogclock SUBDIRS += rasterwindow -qtConfig(opengl): \ +qtHaveModule(gui):qtConfig(opengl): \ SUBDIRS += openglwindow diff --git a/examples/gui/rasterwindow/rasterwindow.cpp b/examples/gui/rasterwindow/rasterwindow.cpp index fb717a4c8a..68d1d7f524 100644 --- a/examples/gui/rasterwindow/rasterwindow.cpp +++ b/examples/gui/rasterwindow/rasterwindow.cpp @@ -53,12 +53,9 @@ //! [1] RasterWindow::RasterWindow(QWindow *parent) : QWindow(parent) + , m_backingStore(new QBackingStore(this)) { - create(); - m_backingStore = new QBackingStore(this); - setGeometry(100, 100, 300, 200); - } //! [1] diff --git a/examples/widgets/widgets.pro b/examples/widgets/widgets.pro index 513ddc91f2..cef4936d32 100644 --- a/examples/widgets/widgets.pro +++ b/examples/widgets/widgets.pro @@ -22,7 +22,7 @@ SUBDIRS = \ tutorials \ widgets -qtConfig(opengl): \ +qtHaveModule(gui):qtConfig(opengl): \ SUBDIRS += windowcontainer contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows |