diff options
| author | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-06-23 11:15:43 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-06-24 16:47:24 +0200 |
| commit | 64cb29a25244348f9d4cd92aaa2b90d8d52120a2 (patch) | |
| tree | cf0c1e8fb791c94c7e779ff2200dd8d69545e06c | |
| parent | 21aba7991592e792808ba4dfeb26fe2b9754544d (diff) | |
Add the graphicsview demo-examples to the build.
Change-Id: I2f97985db9e547c37db00c32b2e1a1658f076f75
Reviewed-on: http://codereview.qt.nokia.com/684
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Boddie
| -rw-r--r-- | examples/graphicsview/boxes/boxes.pro | 4 | ||||
| -rw-r--r-- | examples/graphicsview/chip/chip.pro | 6 | ||||
| -rw-r--r-- | examples/graphicsview/embeddeddialogs/embeddeddialogs.pro | 6 | ||||
| -rw-r--r-- | examples/graphicsview/graphicsview.pro | 6 |
4 files changed, 14 insertions, 8 deletions
diff --git a/examples/graphicsview/boxes/boxes.pro b/examples/graphicsview/boxes/boxes.pro index d599a3a0ac..49de5a9e50 100644 --- a/examples/graphicsview/boxes/boxes.pro +++ b/examples/graphicsview/boxes/boxes.pro @@ -30,11 +30,11 @@ RESOURCES += boxes.qrc QT += opengl # install -target.path = $$[QT_INSTALL_DEMOS]/qtbase/boxes +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/boxes sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.jpg *.png *.fsh *.vsh *.par sources.files -= 3rdparty/fbm.h 3rdparty/fbm.c sources.files += 3rdparty -sources.path = $$[QT_INSTALL_DEMOS]/qtbase/boxes +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/boxes INSTALLS += target sources wince*: { diff --git a/examples/graphicsview/chip/chip.pro b/examples/graphicsview/chip/chip.pro index 1e1a7de735..aff551ef9f 100644 --- a/examples/graphicsview/chip/chip.pro +++ b/examples/graphicsview/chip/chip.pro @@ -12,9 +12,9 @@ build_all:!build_pass { } # install -target.path = $$[QT_INSTALL_DEMOS]/qtbase/chip +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/chip sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.pro *.html *.doc images -sources.path = $$[QT_INSTALL_DEMOS]/qtbase/chip +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/chip INSTALLS += target sources -symbian: CONFIG += qt_demo +symbian: CONFIG += qt_example diff --git a/examples/graphicsview/embeddeddialogs/embeddeddialogs.pro b/examples/graphicsview/embeddeddialogs/embeddeddialogs.pro index 675a9889a2..31386063f6 100644 --- a/examples/graphicsview/embeddeddialogs/embeddeddialogs.pro +++ b/examples/graphicsview/embeddeddialogs/embeddeddialogs.pro @@ -11,9 +11,9 @@ build_all:!build_pass { } # install -target.path = $$[QT_INSTALL_DEMOS]/qtbase/embeddeddialogs +target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/embeddeddialogs sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.png *.jpg *.plist *.icns *.ico *.rc *.pro *.html *.doc images -sources.path = $$[QT_INSTALL_DEMOS]/qtbase/embeddeddialogs +sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/embeddeddialogs INSTALLS += target sources -symbian: CONFIG += qt_demo +symbian: CONFIG += qt_example diff --git a/examples/graphicsview/graphicsview.pro b/examples/graphicsview/graphicsview.pro index d1b0e86e7f..190c48a596 100644 --- a/examples/graphicsview/graphicsview.pro +++ b/examples/graphicsview/graphicsview.pro @@ -1,6 +1,8 @@ TEMPLATE = subdirs SUBDIRS = \ + chip \ elasticnodes \ + embeddeddialogs \ collidingmice \ padnavigator \ basicgraphicslayouts @@ -15,6 +17,10 @@ SUBDIRS = \ contains(DEFINES, QT_NO_CURSOR)|contains(DEFINES, QT_NO_DRAGANDDROP): SUBDIRS -= dragdroprobot +contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles1):!contains(QT_CONFIG, opengles2):{ + SUBDIRS += boxes +} + # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS graphicsview.pro README |