Commit feb7f323 authored by Mitch Curtis's avatar Mitch Curtis
Browse files

Flatten example install path and directory structure


Change-Id: Ic270635b0c17578bc9f85cca2d9f3a7b49e33952
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: default avatarMitch Curtis <mitch.curtis@theqtcompany.com>
Showing with 6 additions and 9 deletions
TEMPLATE = subdirs
SUBDIRS += quick/enterprise/virtualkeyboard
SUBDIRS += virtualkeyboard
......@@ -8,9 +8,9 @@ static {
QTPLUGIN += qtvirtualkeyboardplugin
}
android-no-sdk|!isEmpty(CROSS_COMPILE) {
TARGETPATH = /data/user/qt/virtualkeyboard
TARGETPATH = /data/user/qt/virtualkeyboard/basic
} else {
TARGETPATH = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard
TARGETPATH = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard/basic
}
target.path = $$TARGETPATH
INSTALLS += target
......
......@@ -15,12 +15,9 @@ sourcedirs += ..
excludedirs += ../content/layouts \
../3rdparty
# Specify the install path under QT_INSTALL_EXAMPLES
# Examples will be installed under quick/enterprise/virtualkeyboard -
# 'enterprise/virtualkeyboard' subdirectory is given as part of \example commands
exampledirs += ../../../examples/quick \
exampledirs += ../../../examples/virtualkeyboard \
snippets
examplesinstallpath = quick
examplesinstallpath = qtvirtualkeyboard/virtualkeyboard
imagedirs += images
depends += qtcore qtgui qtquick
......
......@@ -27,7 +27,7 @@
/*!
\title Qt Quick Virtual Keyboard - Basic Example
\example enterprise/virtualkeyboard/basic
\example basic
\brief This is a basic QML example that uses the virtual keyboard.
\ingroup qtvirtualkeyboard-examples
\image basic-example.png
......
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