diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-18 16:08:40 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-18 16:08:40 +0100 |
| commit | aa8e59c09cb03f56047ca65c3e89dd6daeec4d73 (patch) | |
| tree | d45d5513511b0767925f453b637bda08139562da /src/imports | |
| parent | ae764c678c78c1e3530a6d0dc2de2a17c5d4815a (diff) | |
| parent | cf8ef1676b70d70f5e1d2725d0b24d7df5e8cfe4 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I4fd7f5c1096b0460bd23e2831e6207d63c2b69e3
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/imports.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/imports.pro b/src/imports/imports.pro index aba013aa..2d7f4a55 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs SUBDIRS += folderlistmodel particles gestures builtins.pro -contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles1): SUBDIRS += shaders +qtHaveModule(opengl):!contains(QT_CONFIG, opengles1): SUBDIRS += shaders -!isEmpty(QT.webkitwidgets.name): SUBDIRS += webview +qtHaveModule(webkitwidgets): SUBDIRS += webview |