diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-02 09:04:38 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-03-02 09:04:38 +0100 |
commit | 71264bae08d81bdeceb96133fdb01c370504dfcc (patch) | |
tree | d5dadaac8209d5ef1857a4d65197b9ee12b39848 /examples | |
parent | 5e785c0b83c9908c665f253c131629ac325a21f5 (diff) | |
parent | 6d10f739cd750968d0dd0e9d8fa4b64353a86c6c (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I84097f8e7b3b2128028bd7693c913d6968b82bfe
Diffstat (limited to 'examples')
-rw-r--r-- | examples/network/network.pro | 1 | ||||
-rw-r--r-- | examples/widgets/widgets/tablet/tabletcanvas.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/examples/network/network.pro b/examples/network/network.pro index 3a269f16ae..d64b16c760 100644 --- a/examples/network/network.pro +++ b/examples/network/network.pro @@ -30,7 +30,6 @@ qtHaveModule(widgets) { } qtConfig(openssl): SUBDIRS += securesocketclient - qtConfig(openssl-linked): SUBDIRS += securesocketclient qtConfig(sctp): SUBDIRS += multistreamserver multistreamclient } diff --git a/examples/widgets/widgets/tablet/tabletcanvas.cpp b/examples/widgets/widgets/tablet/tabletcanvas.cpp index ba797500e9..03e05e42f6 100644 --- a/examples/widgets/widgets/tablet/tabletcanvas.cpp +++ b/examples/widgets/widgets/tablet/tabletcanvas.cpp @@ -67,6 +67,7 @@ TabletCanvas::TabletCanvas() resize(500, 500); initPixmap(); setAutoFillBackground(true); + setAttribute(Qt::WA_TabletTracking); } void TabletCanvas::initPixmap() |