From 1186451a6efe78fad20cb4aa44e2b046b597d3ce Mon Sep 17 00:00:00 2001
From: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
Date: Fri, 13 Feb 2015 16:25:31 +0100
Subject: Fix install of filesystembrowser example

Change-Id: Iebc592d37b8c720bdced5946e1c1a56322a06411
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
---
 examples/quick/controls/controls.pro               |  5 ++--
 .../controls/filesystembrowser/deployment.pri      | 27 ----------------------
 .../filesystembrowser/filesystembrowser.pro        |  8 +------
 3 files changed, 3 insertions(+), 37 deletions(-)
 delete mode 100644 examples/quick/controls/filesystembrowser/deployment.pri

(limited to 'examples')

diff --git a/examples/quick/controls/controls.pro b/examples/quick/controls/controls.pro
index 2b164dc2..ea8ce554 100644
--- a/examples/quick/controls/controls.pro
+++ b/examples/quick/controls/controls.pro
@@ -5,11 +5,10 @@ SUBDIRS += \
     tableview \
     touch \
     basiclayouts \
-    styles \
-    filesystembrowser
+    styles
 
 qtHaveModule(widgets) {
-    SUBDIRS += texteditor
+    SUBDIRS += texteditor filesystembrowser
 }
 
 qtHaveModule(sql) {
diff --git a/examples/quick/controls/filesystembrowser/deployment.pri b/examples/quick/controls/filesystembrowser/deployment.pri
deleted file mode 100644
index 5441b63d..00000000
--- a/examples/quick/controls/filesystembrowser/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/quick/controls/filesystembrowser/filesystembrowser.pro b/examples/quick/controls/filesystembrowser/filesystembrowser.pro
index 1cdc565a..bf77d958 100644
--- a/examples/quick/controls/filesystembrowser/filesystembrowser.pro
+++ b/examples/quick/controls/filesystembrowser/filesystembrowser.pro
@@ -1,13 +1,7 @@
 TEMPLATE = app
-
+TARGET = filesystembrowser
 QT += qml quick widgets
 
 SOURCES += main.cpp
 
 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)
-- 
cgit v1.2.1