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 /demos | |
| 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 'demos')
| -rw-r--r-- | demos/qt3d/cubehouse/cubehouse.pro | 2 | ||||
| -rw-r--r-- | demos/qt3d/pageflip/pageflip.pro | 2 | ||||
| -rw-r--r-- | demos/qt3d/photobrowser3d/photobrowser3d.pro | 2 | ||||
| -rw-r--r-- | demos/qt3d/shapes/shapes.pro | 2 | ||||
| -rw-r--r-- | demos/qt3d/teaservice/teaservice.pro | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/demos/qt3d/cubehouse/cubehouse.pro b/demos/qt3d/cubehouse/cubehouse.pro index 5fb35a606..1bd96cf80 100644 --- a/demos/qt3d/cubehouse/cubehouse.pro +++ b/demos/qt3d/cubehouse/cubehouse.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = cubehouse CONFIG += qt warn_on -QT += qt3d +QT += 3d include (../../../pkg.pri) diff --git a/demos/qt3d/pageflip/pageflip.pro b/demos/qt3d/pageflip/pageflip.pro index beec3b279..8dc0ba588 100644 --- a/demos/qt3d/pageflip/pageflip.pro +++ b/demos/qt3d/pageflip/pageflip.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = pageflip CONFIG += qt warn_on -QT += qt3d +QT += 3d include(../../../pkg.pri) diff --git a/demos/qt3d/photobrowser3d/photobrowser3d.pro b/demos/qt3d/photobrowser3d/photobrowser3d.pro index 7d4a30242..83eb2156f 100644 --- a/demos/qt3d/photobrowser3d/photobrowser3d.pro +++ b/demos/qt3d/photobrowser3d/photobrowser3d.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = photobrowser3d CONFIG += qt warn_on -QT += qt3d +QT += 3d include (../../../pkg.pri) diff --git a/demos/qt3d/shapes/shapes.pro b/demos/qt3d/shapes/shapes.pro index 66645bcbf..c2e3e89dc 100644 --- a/demos/qt3d/shapes/shapes.pro +++ b/demos/qt3d/shapes/shapes.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = shapes CONFIG += qt warn_on -QT += qt3d +QT += 3d include (../../../pkg.pri) diff --git a/demos/qt3d/teaservice/teaservice.pro b/demos/qt3d/teaservice/teaservice.pro index d2d19f4ae..60d469f25 100644 --- a/demos/qt3d/teaservice/teaservice.pro +++ b/demos/qt3d/teaservice/teaservice.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = teaservice CONFIG += qt warn_on -QT += qt3d +QT += 3d include (../../../pkg.pri) |