Build demo files into qt3d/bin and tidy up demo .pro files

Change-Id: I9a0e5bc28ae1089819dce7a766c572e8a4f8b780 Reviewed-by: Danny Pope <[email protected]>
dignakov · Feb 12, 2012 · ce825d2 · ce825d2
1 parent 89ed10a
commit ce825d2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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