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 /src/plugins | |
| 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 'src/plugins')
| -rw-r--r-- | src/plugins/sceneformats/3ds/3ds.pro | 4 | ||||
| -rw-r--r-- | src/plugins/sceneformats/assimp/assimp.pro | 4 | ||||
| -rw-r--r-- | src/plugins/sceneformats/bezier/bezier.pro | 4 | ||||
| -rw-r--r-- | src/plugins/sceneformats/obj/obj.pro | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/sceneformats/3ds/3ds.pro b/src/plugins/sceneformats/3ds/3ds.pro index 78d4c44d6..c7016f2bb 100644 --- a/src/plugins/sceneformats/3ds/3ds.pro +++ b/src/plugins/sceneformats/3ds/3ds.pro @@ -10,9 +10,9 @@ SOURCES += main.cpp \ qgl3dsscenehandler.cpp \ qgl3dsmesh.cpp -QT += qt3d +QT += 3d -DESTDIR = $$QT.qt3d.plugins/sceneformats +DESTDIR = $$QT.3d.plugins/sceneformats target.path = $$[QT_INSTALL_PLUGINS]/sceneformats INSTALLS += target diff --git a/src/plugins/sceneformats/assimp/assimp.pro b/src/plugins/sceneformats/assimp/assimp.pro index 2f6dcc13f..39fbb5454 100644 --- a/src/plugins/sceneformats/assimp/assimp.pro +++ b/src/plugins/sceneformats/assimp/assimp.pro @@ -14,9 +14,9 @@ SOURCES += main.cpp \ ailoaderiostream.cpp \ ailoaderiosystem.cpp -QT += qt3d +QT += 3d -DESTDIR = $$QT.qt3d.plugins/sceneformats +DESTDIR = $$QT.3d.plugins/sceneformats target.path = $$[QT_INSTALL_PLUGINS]/sceneformats INSTALLS += target diff --git a/src/plugins/sceneformats/bezier/bezier.pro b/src/plugins/sceneformats/bezier/bezier.pro index 50acdb3a5..911dc60ef 100644 --- a/src/plugins/sceneformats/bezier/bezier.pro +++ b/src/plugins/sceneformats/bezier/bezier.pro @@ -7,8 +7,8 @@ SOURCES += main.cpp \ qglbezierscene.cpp \ qglbezierscenehandler.cpp -QT += qt3d +QT += 3d -DESTDIR = $$QT.qt3d.plugins/sceneformats +DESTDIR = $$QT.3d.plugins/sceneformats target.path = $$[QT_INSTALL_PLUGINS]/sceneformats INSTALLS += target diff --git a/src/plugins/sceneformats/obj/obj.pro b/src/plugins/sceneformats/obj/obj.pro index 2590f3d4d..c20cc91f3 100644 --- a/src/plugins/sceneformats/obj/obj.pro +++ b/src/plugins/sceneformats/obj/obj.pro @@ -7,8 +7,8 @@ SOURCES += main.cpp \ qglobjscene.cpp \ qglobjscenehandler.cpp -QT += qt3d +QT += 3d -DESTDIR = $$QT.qt3d.plugins/sceneformats +DESTDIR = $$QT.3d.plugins/sceneformats target.path = $$[QT_INSTALL_PLUGINS]/sceneformats INSTALLS += target |