diff options
author | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2015-02-13 16:25:31 +0100 |
---|---|---|
committer | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2015-02-13 15:27:56 +0000 |
commit | 1186451a6efe78fad20cb4aa44e2b046b597d3ce (patch) | |
tree | 65b3ff080ccc00b78184cf5b41a6f4a44e0d4360 /examples/quick | |
parent | 0674b38c9cd12fde6b41ef4be079352878befa9a (diff) | |
download | qtquickcontrols-1186451a6efe78fad20cb4aa44e2b046b597d3ce.tar.gz |
Fix install of filesystembrowser example
Change-Id: Iebc592d37b8c720bdced5946e1c1a56322a06411
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
Diffstat (limited to 'examples/quick')
-rw-r--r-- | examples/quick/controls/controls.pro | 5 | ||||
-rw-r--r-- | examples/quick/controls/filesystembrowser/deployment.pri | 27 | ||||
-rw-r--r-- | examples/quick/controls/filesystembrowser/filesystembrowser.pro | 8 |
3 files changed, 3 insertions, 37 deletions
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) |