diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-19 09:47:29 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-19 09:47:29 +0200 |
| commit | 407302fb1b823fbe0ae09c031862f87b252489e6 (patch) | |
| tree | f192faf40b9009ee6a884ed4b7d0b3942b6810ac /examples/embedded | |
| parent | 0f30dcaea8129092142fe87d2d14209c75363f66 (diff) | |
| parent | ad3b41a06d9ba7219c79b5548c5b11698787288d (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/corelib/io/qwindowspipewriter.cpp
src/widgets/styles/qcommonstyle.cpp
Change-Id: I0d33efdc4dc256e234abc490a18ccda72cd1d9e6
Diffstat (limited to 'examples/embedded')
| -rw-r--r-- | examples/embedded/embedded.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/embedded/embedded.pro b/examples/embedded/embedded.pro index 90ee504adf..e772eb88aa 100644 --- a/examples/embedded/embedded.pro +++ b/examples/embedded/embedded.pro @@ -1,4 +1,4 @@ -requires(if(wince|embedded|x11):qtHaveModule(gui)) +requires(if(embedded|x11):qtHaveModule(gui)) TEMPLATE = subdirs SUBDIRS = styleexample raycasting flickable digiflip |