diff options
author | Alex Blasche <alexander.blasche@digia.com> | 2013-09-11 16:50:44 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-16 09:33:30 +0200 |
commit | db8c9f18d087412849b91d26bc1b496237fb9c10 (patch) | |
tree | 0eeedd9569b8106d6f23acf7e954a60b0721c0ac /src/src.pro | |
parent | e31739e1b6d24616654b03d30bcdf6aeba037117 (diff) | |
download | qtlocation-db8c9f18d087412849b91d26bc1b496237fb9c10.tar.gz |
Improve definition of projects belonging to QtPositioning & QtLocation
This enables clean builds of qtlocation repo even if Qt3D is not available.
In such cases only QtPositioning related projects should be build.
There is a small build fix as well as some quick related includes
changed from proper includes to forward declarations.
Change-Id: Ifa8a9315beabcc1f64be219f8fa55236bf4ce42f
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/src.pro')
-rw-r--r-- | src/src.pro | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/src.pro b/src/src.pro index bb05e39f..f6e41510 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,6 +1,13 @@ TEMPLATE = subdirs CONFIG += ordered -SUBDIRS += 3rdparty positioning location plugins +SUBDIRS += positioning + +#no point in building QtLocation without Qt3D +qtHaveModule(3d) { + SUBDIRS += location 3rdparty +} + +SUBDIRS += plugins qtHaveModule(quick): SUBDIRS += imports |