diff options
author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2016-04-20 14:01:02 +0200 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2016-04-20 14:44:33 +0000 |
commit | feb7f323c99bed96084f2453b4cee504815c92d1 (patch) | |
tree | e4ee3ef9cfa0ae7bf8a48fc0786da584cb575717 /examples | |
parent | 89a39f738c3e1bcc65e58de9ba21d18c9b1556cc (diff) |
Flatten example install path and directory structure
Change-Id: Ic270635b0c17578bc9f85cca2d9f3a7b49e33952
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/examples.pro | 2 | ||||
-rw-r--r-- | examples/virtualkeyboard/basic/basic-b2qt.qml (renamed from examples/quick/enterprise/virtualkeyboard/basic/basic-b2qt.qml) | 0 | ||||
-rw-r--r-- | examples/virtualkeyboard/basic/basic.pro (renamed from examples/quick/enterprise/virtualkeyboard/basic/basic.pro) | 4 | ||||
-rw-r--r-- | examples/virtualkeyboard/basic/basic.qml (renamed from examples/quick/enterprise/virtualkeyboard/basic/basic.qml) | 0 | ||||
-rw-r--r-- | examples/virtualkeyboard/basic/content/AutoScroller.qml (renamed from examples/quick/enterprise/virtualkeyboard/basic/content/AutoScroller.qml) | 0 | ||||
-rw-r--r-- | examples/virtualkeyboard/basic/content/FloatingButton_Active.svg (renamed from examples/quick/enterprise/virtualkeyboard/basic/content/FloatingButton_Active.svg) | 0 | ||||
-rw-r--r-- | examples/virtualkeyboard/basic/content/FloatingButton_Available.svg (renamed from examples/quick/enterprise/virtualkeyboard/basic/content/FloatingButton_Available.svg) | 0 | ||||
-rw-r--r-- | examples/virtualkeyboard/basic/content/FloatingButton_Unavailable.svg (renamed from examples/quick/enterprise/virtualkeyboard/basic/content/FloatingButton_Unavailable.svg) | 0 | ||||
-rw-r--r-- | examples/virtualkeyboard/basic/content/HandwritingModeButton.qml (renamed from examples/quick/enterprise/virtualkeyboard/basic/content/HandwritingModeButton.qml) | 0 | ||||
-rw-r--r-- | examples/virtualkeyboard/basic/content/ScrollBar.qml (renamed from examples/quick/enterprise/virtualkeyboard/basic/content/ScrollBar.qml) | 0 | ||||
-rw-r--r-- | examples/virtualkeyboard/basic/content/TextArea.qml (renamed from examples/quick/enterprise/virtualkeyboard/basic/content/TextArea.qml) | 0 | ||||
-rw-r--r-- | examples/virtualkeyboard/basic/content/TextBase.qml (renamed from examples/quick/enterprise/virtualkeyboard/basic/content/TextBase.qml) | 0 | ||||
-rw-r--r-- | examples/virtualkeyboard/basic/content/TextField.qml (renamed from examples/quick/enterprise/virtualkeyboard/basic/content/TextField.qml) | 0 | ||||
-rw-r--r-- | examples/virtualkeyboard/basic/demo.qrc (renamed from examples/quick/enterprise/virtualkeyboard/basic/demo.qrc) | 0 | ||||
-rw-r--r-- | examples/virtualkeyboard/basic/main.cpp (renamed from examples/quick/enterprise/virtualkeyboard/basic/main.cpp) | 0 | ||||
-rw-r--r-- | examples/virtualkeyboard/virtualkeyboard.pro (renamed from examples/quick/enterprise/virtualkeyboard/virtualkeyboard.pro) | 0 |
16 files changed, 3 insertions, 3 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index 7664d615..9bcb2294 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -SUBDIRS += quick/enterprise/virtualkeyboard +SUBDIRS += virtualkeyboard diff --git a/examples/quick/enterprise/virtualkeyboard/basic/basic-b2qt.qml b/examples/virtualkeyboard/basic/basic-b2qt.qml index 4c257ee6..4c257ee6 100644 --- a/examples/quick/enterprise/virtualkeyboard/basic/basic-b2qt.qml +++ b/examples/virtualkeyboard/basic/basic-b2qt.qml diff --git a/examples/quick/enterprise/virtualkeyboard/basic/basic.pro b/examples/virtualkeyboard/basic/basic.pro index b0b87e7c..2e4dd499 100644 --- a/examples/quick/enterprise/virtualkeyboard/basic/basic.pro +++ b/examples/virtualkeyboard/basic/basic.pro @@ -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 diff --git a/examples/quick/enterprise/virtualkeyboard/basic/basic.qml b/examples/virtualkeyboard/basic/basic.qml index dc4f1309..dc4f1309 100644 --- a/examples/quick/enterprise/virtualkeyboard/basic/basic.qml +++ b/examples/virtualkeyboard/basic/basic.qml diff --git a/examples/quick/enterprise/virtualkeyboard/basic/content/AutoScroller.qml b/examples/virtualkeyboard/basic/content/AutoScroller.qml index 33aab92a..33aab92a 100644 --- a/examples/quick/enterprise/virtualkeyboard/basic/content/AutoScroller.qml +++ b/examples/virtualkeyboard/basic/content/AutoScroller.qml diff --git a/examples/quick/enterprise/virtualkeyboard/basic/content/FloatingButton_Active.svg b/examples/virtualkeyboard/basic/content/FloatingButton_Active.svg index ef108358..ef108358 100644 --- a/examples/quick/enterprise/virtualkeyboard/basic/content/FloatingButton_Active.svg +++ b/examples/virtualkeyboard/basic/content/FloatingButton_Active.svg diff --git a/examples/quick/enterprise/virtualkeyboard/basic/content/FloatingButton_Available.svg b/examples/virtualkeyboard/basic/content/FloatingButton_Available.svg index 1178c8c6..1178c8c6 100644 --- a/examples/quick/enterprise/virtualkeyboard/basic/content/FloatingButton_Available.svg +++ b/examples/virtualkeyboard/basic/content/FloatingButton_Available.svg diff --git a/examples/quick/enterprise/virtualkeyboard/basic/content/FloatingButton_Unavailable.svg b/examples/virtualkeyboard/basic/content/FloatingButton_Unavailable.svg index d8149b53..d8149b53 100644 --- a/examples/quick/enterprise/virtualkeyboard/basic/content/FloatingButton_Unavailable.svg +++ b/examples/virtualkeyboard/basic/content/FloatingButton_Unavailable.svg diff --git a/examples/quick/enterprise/virtualkeyboard/basic/content/HandwritingModeButton.qml b/examples/virtualkeyboard/basic/content/HandwritingModeButton.qml index c135729b..c135729b 100644 --- a/examples/quick/enterprise/virtualkeyboard/basic/content/HandwritingModeButton.qml +++ b/examples/virtualkeyboard/basic/content/HandwritingModeButton.qml diff --git a/examples/quick/enterprise/virtualkeyboard/basic/content/ScrollBar.qml b/examples/virtualkeyboard/basic/content/ScrollBar.qml index a77ff20b..a77ff20b 100644 --- a/examples/quick/enterprise/virtualkeyboard/basic/content/ScrollBar.qml +++ b/examples/virtualkeyboard/basic/content/ScrollBar.qml diff --git a/examples/quick/enterprise/virtualkeyboard/basic/content/TextArea.qml b/examples/virtualkeyboard/basic/content/TextArea.qml index 91046582..91046582 100644 --- a/examples/quick/enterprise/virtualkeyboard/basic/content/TextArea.qml +++ b/examples/virtualkeyboard/basic/content/TextArea.qml diff --git a/examples/quick/enterprise/virtualkeyboard/basic/content/TextBase.qml b/examples/virtualkeyboard/basic/content/TextBase.qml index 59777f01..59777f01 100644 --- a/examples/quick/enterprise/virtualkeyboard/basic/content/TextBase.qml +++ b/examples/virtualkeyboard/basic/content/TextBase.qml diff --git a/examples/quick/enterprise/virtualkeyboard/basic/content/TextField.qml b/examples/virtualkeyboard/basic/content/TextField.qml index 8ae8fa3f..8ae8fa3f 100644 --- a/examples/quick/enterprise/virtualkeyboard/basic/content/TextField.qml +++ b/examples/virtualkeyboard/basic/content/TextField.qml diff --git a/examples/quick/enterprise/virtualkeyboard/basic/demo.qrc b/examples/virtualkeyboard/basic/demo.qrc index 6bd24d05..6bd24d05 100644 --- a/examples/quick/enterprise/virtualkeyboard/basic/demo.qrc +++ b/examples/virtualkeyboard/basic/demo.qrc diff --git a/examples/quick/enterprise/virtualkeyboard/basic/main.cpp b/examples/virtualkeyboard/basic/main.cpp index 5bf6b75d..5bf6b75d 100644 --- a/examples/quick/enterprise/virtualkeyboard/basic/main.cpp +++ b/examples/virtualkeyboard/basic/main.cpp diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard.pro b/examples/virtualkeyboard/virtualkeyboard.pro index 3ea78202..3ea78202 100644 --- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard.pro +++ b/examples/virtualkeyboard/virtualkeyboard.pro |