summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorRobin Burchell <robin.burchell@viroteck.net>2016-07-05 17:16:44 +0200
committerRobin Burchell <robin.burchell@viroteck.net>2016-07-05 19:34:05 +0000
commitdffe4ab249ced63255e83942be447df4183bf2f2 (patch)
tree5d673bf43abdbea8d44009ef02a4a1f1c73c0afc /examples
parent506ae2dba8270341cbe3ee6435baf472b0d1abed (diff)
demos: Fix installation of photoviewer example and add to build
deployment.pri seems suspicious (and qmake errors about it actually), so just use the example install path and trust that it will be okay. Change-Id: Id3b6abd80f84485e006473130873ab89ee11c0d4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/quick/demos/demos.pro3
-rw-r--r--examples/quick/demos/photoviewer/deployment.pri23
-rw-r--r--examples/quick/demos/photoviewer/photoviewer.pro7
3 files changed, 3 insertions, 30 deletions
diff --git a/examples/quick/demos/demos.pro b/examples/quick/demos/demos.pro
index 9aac7bf6f7..e6937683ab 100644
--- a/examples/quick/demos/demos.pro
+++ b/examples/quick/demos/demos.pro
@@ -5,9 +5,8 @@ SUBDIRS = samegame \
tweetsearch \
maroon \
photosurface \
+ photoviewer \
stocqt
qtHaveModule(xmlpatterns): SUBDIRS += rssnews
-EXAMPLE_FILES = \
- photoviewer
diff --git a/examples/quick/demos/photoviewer/deployment.pri b/examples/quick/demos/photoviewer/deployment.pri
deleted file mode 100644
index 839b3b5cac..0000000000
--- a/examples/quick/demos/photoviewer/deployment.pri
+++ /dev/null
@@ -1,23 +0,0 @@
-android-no-sdk {
- target.path = /data/user/qt
- export(target.path)
- INSTALLS += target
-} else:android {
- x86 {
- target.path = /libs/x86
- } else: armeabi-v7a {
- target.path = /libs/armeabi-v7a
- } else {
- target.path = /libs/armeabi
- }
- export(target.path)
- INSTALLS += target
-} else:unix {
- isEmpty(target.path) {
- target.path = /opt/$${TARGET}/bin
- export(target.path)
- }
- INSTALLS += target
-}
-
-export(INSTALLS)
diff --git a/examples/quick/demos/photoviewer/photoviewer.pro b/examples/quick/demos/photoviewer/photoviewer.pro
index 704e2ce003..4bfdb86f31 100644
--- a/examples/quick/demos/photoviewer/photoviewer.pro
+++ b/examples/quick/demos/photoviewer/photoviewer.pro
@@ -15,8 +15,5 @@ TRANSLATIONS += i18n/qml_fr.ts \
RESOURCES += qml.qrc
-# Additional import path used to resolve QML modules in Qt Creator's code model
-QML_IMPORT_PATH =
-
-# Default rules for deployment.
-include(deployment.pri)
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/photoviewer
+INSTALLS += target