diff options
| author | Peter Yard <peter.yard@nokia.com> | 2012-02-09 16:13:04 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-14 00:49:05 +0100 |
| commit | 00d127f73034c0aa4b21db5ef13490ea2ddf65b8 (patch) | |
| tree | 88e99ce16105c005ac8f2c0076b41f43bf647acb /examples/qt3d | |
| parent | 1703179fb4229cc1a3a4ab3f9d32c442d484d8b2 (diff) | |
Integrate Qt3D into Qt5 and fix some qdoc errors.
This doc change by 'integrating into Qt5' also made some changes to the
build system, so that now you need QT+=3d everywhere (instead of
QT+=qt3d as it was previously).
We have been asked to make this change, and it seems it is required for
this doc system to work, so lets get it done.
Note that the original change had a docsnippets target but that did not
work at all and will have be done in a later commit.
Change-Id: Icf4bc6b4be9494f1752e18ca1f5198c8fe8ecf53
Reviewed-by: Peter Yard <peter.yard@nokia.com>
Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>
Diffstat (limited to 'examples/qt3d')
| -rw-r--r-- | examples/qt3d/basket/basket.pro | 2 | ||||
| -rw-r--r-- | examples/qt3d/builder/builder.pro | 2 | ||||
| -rw-r--r-- | examples/qt3d/cube/cube.pro | 2 | ||||
| -rw-r--r-- | examples/qt3d/cylinder/cylinder.pro | 2 | ||||
| -rw-r--r-- | examples/qt3d/geometry/geometry.pro | 2 | ||||
| -rw-r--r-- | examples/qt3d/nesting/nesting.pro | 2 | ||||
| -rw-r--r-- | examples/qt3d/solarsystem/solarsystem.pro | 2 | ||||
| -rw-r--r-- | examples/qt3d/tank/tank.pro | 2 | ||||
| -rw-r--r-- | examples/qt3d/teapot/teapot.pro | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/examples/qt3d/basket/basket.pro b/examples/qt3d/basket/basket.pro index 4c6abf41c..27f11d281 100644 --- a/examples/qt3d/basket/basket.pro +++ b/examples/qt3d/basket/basket.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = basket CONFIG += qt warn_on -QT += qt3d +QT += 3d include(../../../pkg.pri) diff --git a/examples/qt3d/builder/builder.pro b/examples/qt3d/builder/builder.pro index ee52c5e94..b820221a8 100644 --- a/examples/qt3d/builder/builder.pro +++ b/examples/qt3d/builder/builder.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = builder CONFIG += qt warn_on -QT += qt3d +QT += 3d include(../../../pkg.pri) diff --git a/examples/qt3d/cube/cube.pro b/examples/qt3d/cube/cube.pro index 3658fe493..7eae07d91 100644 --- a/examples/qt3d/cube/cube.pro +++ b/examples/qt3d/cube/cube.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = cube CONFIG += qt warn_on -QT += qt3d +QT += 3d include(../../../pkg.pri) diff --git a/examples/qt3d/cylinder/cylinder.pro b/examples/qt3d/cylinder/cylinder.pro index b273b94dd..03cb2cc5f 100644 --- a/examples/qt3d/cylinder/cylinder.pro +++ b/examples/qt3d/cylinder/cylinder.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = cylinder CONFIG += qt warn_on -QT += qt3d +QT += 3d include(../../../pkg.pri) diff --git a/examples/qt3d/geometry/geometry.pro b/examples/qt3d/geometry/geometry.pro index 35ff6db86..19216a6f6 100644 --- a/examples/qt3d/geometry/geometry.pro +++ b/examples/qt3d/geometry/geometry.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = geometry CONFIG += qt warn_on -QT += qt3d +QT += 3d include(../../../pkg.pri) diff --git a/examples/qt3d/nesting/nesting.pro b/examples/qt3d/nesting/nesting.pro index 7fee293db..fc1aba7da 100644 --- a/examples/qt3d/nesting/nesting.pro +++ b/examples/qt3d/nesting/nesting.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = nesting CONFIG += qt warn_on -QT += qt3d +QT += 3d include(../../../pkg.pri) diff --git a/examples/qt3d/solarsystem/solarsystem.pro b/examples/qt3d/solarsystem/solarsystem.pro index dc6750c5e..53fe5106c 100644 --- a/examples/qt3d/solarsystem/solarsystem.pro +++ b/examples/qt3d/solarsystem/solarsystem.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = solarsystem CONFIG += qt warn_on -QT += qt3d +QT += 3d include(../../../pkg.pri) diff --git a/examples/qt3d/tank/tank.pro b/examples/qt3d/tank/tank.pro index b2d850886..820feb798 100644 --- a/examples/qt3d/tank/tank.pro +++ b/examples/qt3d/tank/tank.pro @@ -1,7 +1,7 @@ TARGET = tank TEMPLATE = app CONFIG += qt warn_on -QT += qt3d +QT += 3d include(../../../pkg.pri) diff --git a/examples/qt3d/teapot/teapot.pro b/examples/qt3d/teapot/teapot.pro index f0f118278..13c3dc89e 100644 --- a/examples/qt3d/teapot/teapot.pro +++ b/examples/qt3d/teapot/teapot.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = teapot CONFIG += qt warn_on -QT += qt3d +QT += 3d include(../../../pkg.pri) |