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 | |
| 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')
| -rw-r--r-- | src/imports/imports.pro | 2 | ||||
| -rw-r--r-- | src/imports/location/qdeclarativegeomapmousearea.cpp | 1 | ||||
| -rw-r--r-- | src/location/location.pro | 2 | ||||
| -rw-r--r-- | src/plugins/plugins.pro | 2 | ||||
| -rw-r--r-- | src/src.pro | 9 |
5 files changed, 12 insertions, 4 deletions
diff --git a/src/imports/imports.pro b/src/imports/imports.pro index ac340141..460fe156 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs qtHaveModule(positioning): SUBDIRS += positioning -qtHaveModule(3d):qtHaveModule(location): SUBDIRS += location +qtHaveModule(location): SUBDIRS += location diff --git a/src/imports/location/qdeclarativegeomapmousearea.cpp b/src/imports/location/qdeclarativegeomapmousearea.cpp index 51ccaf4d..a9f6fffa 100644 --- a/src/imports/location/qdeclarativegeomapmousearea.cpp +++ b/src/imports/location/qdeclarativegeomapmousearea.cpp @@ -45,6 +45,7 @@ #include <QtQuick/QQuickWindow> #include <QtQuick/private/qquickevents_p_p.h> +#include <QtQuick/private/qquickdrag_p.h> #include <QDebug> diff --git a/src/location/location.pro b/src/location/location.pro index 2ba446b6..c09ea06f 100644 --- a/src/location/location.pro +++ b/src/location/location.pro @@ -12,7 +12,7 @@ PUBLIC_HEADERS += \ SOURCES += \ qlocation.cpp -qtHaveModule(3d): include(maps/maps.pri) +include(maps/maps.pri) include(places/places.pri) HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 457e8051..099f7995 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs qtHaveModule(positioning): SUBDIRS += position -qtHaveModule(3d):qtHaveModule(location) SUBDIRS += geoservices +qtHaveModule(location) SUBDIRS += geoservices 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 |