Commit 356c60f2 authored by Christian Strømme's avatar Christian Strømme Committed by Christian Stromme
Browse files

Remove deployment.pri from the minibrowser example


The minibrowser example was created using the Qt Creator templates,
which includes hard-coded install paths defined in deployment.pri.
For user applications that might make sense, but it doesn't for Qt
examples, instead we should install it into Qt's example directory.

Task-number: QTBUG-49431
Change-Id: Ia4c33574547a17a186125f10b3eaa14512f81dc8
Reviewed-by: default avatarEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Showing with 3 additions and 32 deletions
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)
TEMPLATE = app
TARGET = minibrowser
QT += qml quick webview
......@@ -10,8 +11,5 @@ RESOURCES += qml.qrc
EXAMPLE_FILES += doc
# 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]/webview/minibrowser
INSTALLS += target
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment