From bc9ef5701e8d489db5b8cc42c9d38d1c93286d6f Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Date: Thu, 6 Nov 2014 13:10:08 +0200
Subject: [PATCH] Fix jsonmodels example to install like other examples.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: Iaf1e570b497863936eb25abf289e04c3f70dc365
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
---
examples/canvas3d/jsonmodels/deployment.pri | 27 ---------------------
examples/canvas3d/jsonmodels/jsonmodels.pro | 12 +++------
2 files changed, 3 insertions(+), 36 deletions(-)
delete mode 100644 examples/canvas3d/jsonmodels/deployment.pri
diff --git a/examples/canvas3d/jsonmodels/deployment.pri b/examples/canvas3d/jsonmodels/deployment.pri
deleted file mode 100644
index 5441b63..0000000
--- a/examples/canvas3d/jsonmodels/deployment.pri
+++ /dev/null
@@ -1,27 +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) {
- qnx {
- target.path = /tmp/$${TARGET}/bin
- } else {
- target.path = /opt/$${TARGET}/bin
- }
- export(target.path)
- }
- INSTALLS += target
-}
-
-export(INSTALLS)
diff --git a/examples/canvas3d/jsonmodels/jsonmodels.pro b/examples/canvas3d/jsonmodels/jsonmodels.pro
index df8e925..8c74705 100644
--- a/examples/canvas3d/jsonmodels/jsonmodels.pro
+++ b/examples/canvas3d/jsonmodels/jsonmodels.pro
@@ -1,6 +1,6 @@
-TEMPLATE = app
-
-QT += qml quick
+!include( ../examples.pri ) {
+ error( "Couldn't find the examples.pri file!" )
+}
SOURCES += main.cpp
@@ -8,9 +8,3 @@ RESOURCES += qml.qrc
OTHER_FILES += doc/src/* \
doc/images/*
-
-# Additional import path used to resolve QML modules in Qt Creator's code model
-QML_IMPORT_PATH =
-
-# Default rules for deployment.
-include(deployment.pri)
--
GitLab