diff options
| author | Casper van Donderen <casper.vandonderen@nokia.com> | 2012-07-06 10:47:23 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-06 14:08:57 +0200 |
| commit | 04c25ce79cf781d91b9e78b3420ba54e1701aae0 (patch) | |
| tree | 1266b33d7dccbe0980924dedad04123f04bd0966 | |
| parent | d8cb387c3d11ea33e237d2815e39bdaccc29bb1a (diff) | |
Make it possible to compile Qt3D without QML/Quick.
The C++ implementation of Qt3D could not be compiled without also having
installed QtQML and QtQuick. This change allows the compilation of the
non-QML part of Qt3D separately.
Change-Id: I791a03a0f0e1118f3ec20b77be327786148b8923
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | demos/demos.pro | 3 | ||||
| -rw-r--r-- | examples/examples.pro | 3 | ||||
| -rw-r--r-- | src/src.pro | 3 | ||||
| -rw-r--r-- | tests/auto/auto.pro | 4 | ||||
| -rw-r--r-- | tests/benchmarks/benchmarks.pro | 4 | ||||
| -rw-r--r-- | tests/manual/manual.pro | 31 | ||||
| -rw-r--r-- | tutorials/tutorials.pro | 3 |
7 files changed, 29 insertions, 22 deletions
diff --git a/demos/demos.pro b/demos/demos.pro index c56631066..2b2f034b4 100644 --- a/demos/demos.pro +++ b/demos/demos.pro @@ -1,2 +1,3 @@ TEMPLATE = subdirs -SUBDIRS = quick3d qt3d +SUBDIRS = qt3d +!isEmpty(QT.qml.name): SUBDIRS += quick3d diff --git a/examples/examples.pro b/examples/examples.pro index b008b37d8..33c18114a 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,2 +1,3 @@ TEMPLATE = subdirs -SUBDIRS += quick3d qt3d +SUBDIRS += qt3d +!isEmpty(QT.qml.name): SUBDIRS += quick3d diff --git a/src/src.pro b/src/src.pro index 370362fdf..58a717153 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,3 +1,4 @@ TEMPLATE = subdirs CONFIG += ordered -SUBDIRS = threed quick3d imports +SUBDIRS = threed +!isEmpty(QT.qml.name): SUBDIRS += quick3d imports diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 1f5b55b2e..68c8b55f0 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs -SUBDIRS = threed imports - +SUBDIRS = threed +!isEmpty(QT.qml.name): SUBDIRS += imports contains(QT_CONFIG, qmltest) { SUBDIRS += qml3d !win32 : SUBDIRS += qml3d_visual diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro index a2eac4ed5..49a0a4dfc 100644 --- a/tests/benchmarks/benchmarks.pro +++ b/tests/benchmarks/benchmarks.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs SUBDIRS = \ qarray \ - qglbuilder_perf \ - matrix_properties + qglbuilder_perf +!isEmpty(QT.qml.name): SUBDIRS += matrix_properties diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index f6ff91c83..c741d8cb9 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -1,15 +1,18 @@ TEMPLATE = subdirs -SUBDIRS += displaymodel \ - model3ds \ - navigation1 \ - rotation \ - scaling \ - submesh \ - translation \ - transformations \ - animations \ - qrc \ - basic \ - background \ - fullreferencing \ - shapes +!isEmpty(QT.quick.name) { + SUBDIRS += \ + animations \ + basic \ + background \ + displaymodel \ + fullreferencing \ + model3ds \ + navigation1 \ + qrc \ + rotation \ + scaling \ + shapes \ + submesh \ + translation \ + transformations +} diff --git a/tutorials/tutorials.pro b/tutorials/tutorials.pro index fcf1286ff..97db6318f 100644 --- a/tutorials/tutorials.pro +++ b/tutorials/tutorials.pro @@ -1,5 +1,6 @@ TEMPLATE = subdirs -SUBDIRS += qt3d quick3d +SUBDIRS += qt3d +!isEmpty(QT.qml.name): SUBDIRS += quick3d # These tutorial directories contain code that is of instructive value only, # and therefore it is not packaged for installation along with demos and |