From 89ed10a6470c0540e2a9354b709f4e8753d65d5e Mon Sep 17 00:00:00 2001 From: Julian de Bhal Date: Fri, 10 Feb 2012 13:57:07 +1000 Subject: [PATCH] Build qt3d/c++ based examples into qt3d/bin using pkg.pri Change-Id: Ib3681004af81271994c467e477b2ee0969cf07fe Reviewed-by: Sarah Jane Smith --- examples/qt3d/README | 5 +++++ examples/qt3d/basket/basket.pro | 2 ++ examples/qt3d/builder/builder.pro | 2 ++ examples/qt3d/cube/cube.pro | 2 ++ examples/qt3d/cylinder/cylinder.pro | 2 ++ examples/qt3d/geometry/geometry.pro | 2 ++ examples/qt3d/nesting/nesting.pro | 2 ++ examples/qt3d/solarsystem/solarsystem.pro | 2 ++ examples/qt3d/tank/tank.pro | 2 ++ examples/qt3d/teapot/teapot.pro | 2 ++ 10 files changed, 23 insertions(+) diff --git a/examples/qt3d/README b/examples/qt3d/README index 2a45154d9..065e59eeb 100644 --- a/examples/qt3d/README +++ b/examples/qt3d/README @@ -4,6 +4,11 @@ Qt3D can be used to extend Qt Quick3D with custom 3D items. Qt3D is also a general 3D toolkit, featuring a scenegraph API, support for OpenGL VBO's and other utilities for general 3D programming. +Running "qmake ; make" in either this directory or the example directories +will place any resulting binaries (and any required resources) into qt3d/bin in +the build tree, in line with the logic in pkg.pri. +Note that "make install" should not be run on the qt3d examples except for building packages. + Research work on Qt3D also continues in the labs repository: http://qt.gitorious.org/qt-labs/qt3d diff --git a/examples/qt3d/basket/basket.pro b/examples/qt3d/basket/basket.pro index 4dc471c68..4c6abf41c 100644 --- a/examples/qt3d/basket/basket.pro +++ b/examples/qt3d/basket/basket.pro @@ -3,6 +3,8 @@ TARGET = basket CONFIG += qt warn_on QT += qt3d +include(../../../pkg.pri) + SOURCES = basketview.cpp main.cpp HEADERS = basketview.h basket_data.h RESOURCES = basket.qrc diff --git a/examples/qt3d/builder/builder.pro b/examples/qt3d/builder/builder.pro index a92561a3d..ee52c5e94 100644 --- a/examples/qt3d/builder/builder.pro +++ b/examples/qt3d/builder/builder.pro @@ -4,6 +4,8 @@ CONFIG += qt warn_on QT += qt3d +include(../../../pkg.pri) + SOURCES = builder.cpp \ main.cpp HEADERS = builder.h diff --git a/examples/qt3d/cube/cube.pro b/examples/qt3d/cube/cube.pro index 821f3e9da..3658fe493 100644 --- a/examples/qt3d/cube/cube.pro +++ b/examples/qt3d/cube/cube.pro @@ -3,6 +3,8 @@ TARGET = cube CONFIG += qt warn_on QT += qt3d +include(../../../pkg.pri) + SOURCES = cubeview.cpp main.cpp HEADERS = cubeview.h RESOURCES = cube.qrc diff --git a/examples/qt3d/cylinder/cylinder.pro b/examples/qt3d/cylinder/cylinder.pro index d69470e25..b273b94dd 100644 --- a/examples/qt3d/cylinder/cylinder.pro +++ b/examples/qt3d/cylinder/cylinder.pro @@ -3,6 +3,8 @@ TARGET = cylinder CONFIG += qt warn_on QT += qt3d +include(../../../pkg.pri) + SOURCES = cylinderview.cpp main.cpp HEADERS = cylinderview.h RESOURCES = cylinder.qrc diff --git a/examples/qt3d/geometry/geometry.pro b/examples/qt3d/geometry/geometry.pro index 204a77268..35ff6db86 100644 --- a/examples/qt3d/geometry/geometry.pro +++ b/examples/qt3d/geometry/geometry.pro @@ -3,6 +3,8 @@ TARGET = geometry CONFIG += qt warn_on QT += qt3d +include(../../../pkg.pri) + SOURCES = geometryview.cpp \ main.cpp \ geometry.cpp \ diff --git a/examples/qt3d/nesting/nesting.pro b/examples/qt3d/nesting/nesting.pro index 8cdcecaf7..7fee293db 100644 --- a/examples/qt3d/nesting/nesting.pro +++ b/examples/qt3d/nesting/nesting.pro @@ -3,6 +3,8 @@ TARGET = nesting CONFIG += qt warn_on QT += qt3d +include(../../../pkg.pri) + SOURCES = cubeview.cpp main.cpp HEADERS = cubeview.h RESOURCES = nesting.qrc diff --git a/examples/qt3d/solarsystem/solarsystem.pro b/examples/qt3d/solarsystem/solarsystem.pro index 344cc82a4..dc6750c5e 100644 --- a/examples/qt3d/solarsystem/solarsystem.pro +++ b/examples/qt3d/solarsystem/solarsystem.pro @@ -3,6 +3,8 @@ TARGET = solarsystem CONFIG += qt warn_on QT += qt3d +include(../../../pkg.pri) + SOURCES = solarsystem.cpp \ main.cpp HEADERS = solarsystem.h diff --git a/examples/qt3d/tank/tank.pro b/examples/qt3d/tank/tank.pro index d82489d5a..b2d850886 100644 --- a/examples/qt3d/tank/tank.pro +++ b/examples/qt3d/tank/tank.pro @@ -3,6 +3,8 @@ TEMPLATE = app CONFIG += qt warn_on QT += qt3d +include(../../../pkg.pri) + SOURCES += main.cpp\ tankview.cpp \ tank.cpp \ diff --git a/examples/qt3d/teapot/teapot.pro b/examples/qt3d/teapot/teapot.pro index 6ef036f7c..f0f118278 100644 --- a/examples/qt3d/teapot/teapot.pro +++ b/examples/qt3d/teapot/teapot.pro @@ -3,6 +3,8 @@ TARGET = teapot CONFIG += qt warn_on QT += qt3d +include(../../../pkg.pri) + SOURCES = teapotview.cpp main.cpp HEADERS = teapotview.h