diff options
| author | Zhang Xingtao <zhxt@ovi.com> | 2014-04-29 08:36:27 +0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-29 15:14:02 +0200 |
| commit | f0ecb4c1fa432175a16570216e517efdeaaf1f42 (patch) | |
| tree | aa66af5f73d74797345eb33612f20b5118e5b69b | |
| parent | 466589e5908b44ccf47afa1260527e10a1fa077c (diff) | |
Add dependency check for quickwidgets
If not, there will be an error when building with -no-opengl option:
"Project ERROR: Unknown module(s) in QT: quick-private"
The quickwidgets module depends on qt quick module, and qt quick
module depends on opengl.
Change-Id: If74b5582bdd96ed19ec10dbc534d02146717bc08
Reviewed-by: Liang Qi <liang.qi@digia.com>
| -rw-r--r-- | examples/quick/quick.pro | 4 | ||||
| -rw-r--r-- | src/src.pro | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro index f39931bd94..421f95a162 100644 --- a/examples/quick/quick.pro +++ b/examples/quick/quick.pro @@ -26,8 +26,8 @@ SUBDIRS = quick-accessibility \ # Widget dependent examples qtHaveModule(widgets) { - SUBDIRS += embeddedinwidgets \ - quickwidgets + SUBDIRS += embeddedinwidgets + qtHaveModule(quickwidgets): SUBDIRS += quickwidgets } EXAMPLE_FILES = \ diff --git a/src/src.pro b/src/src.pro index 0cffc9abc0..0f09f34211 100644 --- a/src/src.pro +++ b/src/src.pro @@ -15,6 +15,6 @@ SUBDIRS += \ imports \ qmldevtools -qtHaveModule(widgets):SUBDIRS += quickwidgets +qtHaveModule(quick):qtHaveModule(widgets): SUBDIRS += quickwidgets qmldevtools.CONFIG = host_build |