diff options
| author | Julian de Bhal <julian.debhal@nokia.com> | 2012-02-10 15:42:08 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-12 02:41:09 +0100 |
| commit | ce825d290887afab95731b7bcb48256ba211ebd3 (patch) | |
| tree | 5dc9c7b1c02b54593071c9c9b1075eab0c7db9a2 /demos | |
| parent | 89ed10a6470c0540e2a9354b709f4e8753d65d5e (diff) | |
Build demo files into qt3d/bin and tidy up demo .pro files
Change-Id: I9a0e5bc28ae1089819dce7a766c572e8a4f8b780
Reviewed-by: Danny Pope <daniel.pope@nokia.com>
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/qt3d/cubehouse/cubehouse.pro | 2 | ||||
| -rw-r--r-- | demos/qt3d/pageflip/pageflip.pro | 5 | ||||
| -rw-r--r-- | demos/qt3d/photobrowser3d/photobrowser3d.pro | 3 | ||||
| -rw-r--r-- | demos/qt3d/shapes/shapes.pro | 2 | ||||
| -rw-r--r-- | demos/qt3d/teaservice/teaservice.pro | 3 |
5 files changed, 10 insertions, 5 deletions
diff --git a/demos/qt3d/cubehouse/cubehouse.pro b/demos/qt3d/cubehouse/cubehouse.pro index a0b95465a..5fb35a606 100644 --- a/demos/qt3d/cubehouse/cubehouse.pro +++ b/demos/qt3d/cubehouse/cubehouse.pro @@ -3,6 +3,8 @@ TARGET = cubehouse CONFIG += qt warn_on QT += qt3d +include (../../../pkg.pri) + SOURCES = cubeview.cpp main.cpp projectivetextureeffect.cpp HEADERS = cubeview.h projectivetextureeffect.h win32:DEFINES+=_CRT_SECURE_NO_WARNINGS diff --git a/demos/qt3d/pageflip/pageflip.pro b/demos/qt3d/pageflip/pageflip.pro index de95caaa6..beec3b279 100644 --- a/demos/qt3d/pageflip/pageflip.pro +++ b/demos/qt3d/pageflip/pageflip.pro @@ -3,13 +3,12 @@ TARGET = pageflip CONFIG += qt warn_on QT += qt3d +include(../../../pkg.pri) + SOURCES = pageflip.cpp pageflipmath.cpp HEADERS = pageflipmath_p.h RESOURCES = pageflip.qrc -CONFIG += qt3d_deploy_pkg -include(../../../pkg.pri) - OTHER_FILES += \ pageflip.rc diff --git a/demos/qt3d/photobrowser3d/photobrowser3d.pro b/demos/qt3d/photobrowser3d/photobrowser3d.pro index cf03b7605..7d4a30242 100644 --- a/demos/qt3d/photobrowser3d/photobrowser3d.pro +++ b/demos/qt3d/photobrowser3d/photobrowser3d.pro @@ -1,9 +1,10 @@ TEMPLATE = app TARGET = photobrowser3d CONFIG += qt warn_on - QT += qt3d +include (../../../pkg.pri) + SOURCES += main.cpp\ photobrowser3dview.cpp \ imagedisplay.cpp \ diff --git a/demos/qt3d/shapes/shapes.pro b/demos/qt3d/shapes/shapes.pro index 6453350d9..66645bcbf 100644 --- a/demos/qt3d/shapes/shapes.pro +++ b/demos/qt3d/shapes/shapes.pro @@ -3,6 +3,8 @@ TARGET = shapes CONFIG += qt warn_on QT += qt3d +include (../../../pkg.pri) + SOURCES = shapes.cpp OTHER_FILES += \ diff --git a/demos/qt3d/teaservice/teaservice.pro b/demos/qt3d/teaservice/teaservice.pro index c2a653106..d2d19f4ae 100644 --- a/demos/qt3d/teaservice/teaservice.pro +++ b/demos/qt3d/teaservice/teaservice.pro @@ -1,9 +1,10 @@ TEMPLATE = app TARGET = teaservice CONFIG += qt warn_on - QT += qt3d +include (../../../pkg.pri) + SOURCES = teaservice.cpp meshobject.cpp sceneobject.cpp perpixeleffect.cpp HEADERS = meshobject.h sceneobject.h perpixeleffect.h RESOURCES = teaservice.qrc |