diff options
| author | Samuli Piippo <samuli.piippo@digia.com> | 2014-09-02 10:23:39 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@digia.com> | 2014-09-02 10:24:26 +0300 |
| commit | 406db8fabcf8de5ab31880ca579edb7004cc4f4e (patch) | |
| tree | 6b349020fef1d2f8f601a509d7c259fa40bea0f9 /basicsuite/shared/shared.pri | |
| parent | 2aab20bb2c32aadba2bef16828e3dd0f6c29a30b (diff) | |
| parent | ad9ea42d493bc9b125c019373fa5fe84cfcc225d (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
* origin/stable: (63 commits)
Doc: Bump version to 3.1.1
Make FPS checkbox persistent
Handle accelerometer readings in rotated items
webengine: Add slight delay before loading the start page
webengine: disable the webgl demo
Update screenshot of the Virtual Keyboard demo
[Doc] Use symbolic links for demo preview images
Changed the audio track on the Qt_EnterpriseEmbedded_1080p.mp4 video.
Fix demo descriptions.
launchersettings: make ip field span two columns
Remove deleted demos also from doc
Update all VirtualKeyboard import to version 1.1
Doc: Bump version to 3.1.0
Doc: Content/language improvement for About QtEE demo.
Disable GraphicalEffects demo on beagleboneblack
about: fit text properly to the box
Fix Meet Qt Enterprise Embedded video url on startup
Fix a typo in the new About presentation
About Boot to Qt-demo update
Update Enterprise gallery demo description
...
Change-Id: I928ab65867993c83ae645834430fd15825349fde
Diffstat (limited to 'basicsuite/shared/shared.pri')
| -rw-r--r-- | basicsuite/shared/shared.pri | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/basicsuite/shared/shared.pri b/basicsuite/shared/shared.pri index 8f66b7d..0d7392d 100644 --- a/basicsuite/shared/shared.pri +++ b/basicsuite/shared/shared.pri @@ -1,6 +1,11 @@ # widget dependecy is required by QtCharts demo QT += quick widgets +qtHaveModule(webengine) { + DEFINES += USE_QTWEBENGINE + QT += webengine +} + DESTPATH = /data/user/$$TARGET target.path = $$DESTPATH |