diff options
author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2016-04-20 13:38:28 +0200 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2016-04-20 14:44:27 +0000 |
commit | 89a39f738c3e1bcc65e58de9ba21d18c9b1556cc (patch) | |
tree | 30a4357ef4b4426f94ab9e7af704874e2f5c20c4 /examples | |
parent | ce569436cc3507961b99fd615e9f7a5de954c012 (diff) |
Rename "virtualkeyboard" example to "basic"
This is less confusing, given that the name of the module itself is
so similar, and a bunch of directories are named the same.
Change-Id: I406a729087a5a5a11a488ab3ba345b0119725a2d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/quick/enterprise/virtualkeyboard/basic/basic-b2qt.qml (renamed from examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard-b2qt.qml) | 0 | ||||
-rw-r--r-- | examples/quick/enterprise/virtualkeyboard/basic/basic.pro (renamed from examples/quick/enterprise/virtualkeyboard/virtualkeyboard/virtualkeyboard.pro) | 10 | ||||
-rw-r--r-- | examples/quick/enterprise/virtualkeyboard/basic/basic.qml (renamed from examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard.qml) | 0 | ||||
-rw-r--r-- | examples/quick/enterprise/virtualkeyboard/basic/content/AutoScroller.qml (renamed from examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/AutoScroller.qml) | 0 | ||||
-rw-r--r-- | examples/quick/enterprise/virtualkeyboard/basic/content/FloatingButton_Active.svg (renamed from examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/FloatingButton_Active.svg) | 0 | ||||
-rw-r--r-- | examples/quick/enterprise/virtualkeyboard/basic/content/FloatingButton_Available.svg (renamed from examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/FloatingButton_Available.svg) | 0 | ||||
-rw-r--r-- | examples/quick/enterprise/virtualkeyboard/basic/content/FloatingButton_Unavailable.svg (renamed from examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/FloatingButton_Unavailable.svg) | 0 | ||||
-rw-r--r-- | examples/quick/enterprise/virtualkeyboard/basic/content/HandwritingModeButton.qml (renamed from examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/HandwritingModeButton.qml) | 0 | ||||
-rw-r--r-- | examples/quick/enterprise/virtualkeyboard/basic/content/ScrollBar.qml (renamed from examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/ScrollBar.qml) | 0 | ||||
-rw-r--r-- | examples/quick/enterprise/virtualkeyboard/basic/content/TextArea.qml (renamed from examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextArea.qml) | 0 | ||||
-rw-r--r-- | examples/quick/enterprise/virtualkeyboard/basic/content/TextBase.qml (renamed from examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextBase.qml) | 0 | ||||
-rw-r--r-- | examples/quick/enterprise/virtualkeyboard/basic/content/TextField.qml (renamed from examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextField.qml) | 0 | ||||
-rw-r--r-- | examples/quick/enterprise/virtualkeyboard/basic/demo.qrc (renamed from examples/quick/enterprise/virtualkeyboard/virtualkeyboard/demo.qrc) | 4 | ||||
-rw-r--r-- | examples/quick/enterprise/virtualkeyboard/basic/main.cpp (renamed from examples/quick/enterprise/virtualkeyboard/virtualkeyboard/main.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/enterprise/virtualkeyboard/virtualkeyboard.pro | 2 |
15 files changed, 8 insertions, 8 deletions
diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard-b2qt.qml b/examples/quick/enterprise/virtualkeyboard/basic/basic-b2qt.qml index 4c257ee6..4c257ee6 100644 --- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard-b2qt.qml +++ b/examples/quick/enterprise/virtualkeyboard/basic/basic-b2qt.qml diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/virtualkeyboard.pro b/examples/quick/enterprise/virtualkeyboard/basic/basic.pro index 28cc4dcc..b0b87e7c 100644 --- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/virtualkeyboard.pro +++ b/examples/quick/enterprise/virtualkeyboard/basic/basic.pro @@ -1,5 +1,5 @@ TEMPLATE = app -TARGET = virtualkeyboard +TARGET = basic QT += qml quick SOURCES += main.cpp CONFIG += link_pkgconfig @@ -19,8 +19,8 @@ RESOURCES += \ demo.qrc OTHER_FILES += \ - VirtualKeyboard.qml \ - VirtualKeyboard-b2qt.qml \ + basic.qml \ + basic-b2qt.qml \ content/AutoScroller.qml \ content/HandwritingModeButton.qml \ content/ScrollBar.qml \ @@ -34,7 +34,7 @@ disable-xcb { } disable-desktop|android-no-sdk|!isEmpty(CROSS_COMPILE)|qnx { - DEFINES += MAIN_QML=\\\"VirtualKeyboard-b2qt.qml\\\" + DEFINES += MAIN_QML=\\\"basic-b2qt.qml\\\" } else { - DEFINES += MAIN_QML=\\\"VirtualKeyboard.qml\\\" + DEFINES += MAIN_QML=\\\"basic.qml\\\" } diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard.qml b/examples/quick/enterprise/virtualkeyboard/basic/basic.qml index dc4f1309..dc4f1309 100644 --- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard.qml +++ b/examples/quick/enterprise/virtualkeyboard/basic/basic.qml diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/AutoScroller.qml b/examples/quick/enterprise/virtualkeyboard/basic/content/AutoScroller.qml index 33aab92a..33aab92a 100644 --- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/AutoScroller.qml +++ b/examples/quick/enterprise/virtualkeyboard/basic/content/AutoScroller.qml diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/FloatingButton_Active.svg b/examples/quick/enterprise/virtualkeyboard/basic/content/FloatingButton_Active.svg index ef108358..ef108358 100644 --- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/FloatingButton_Active.svg +++ b/examples/quick/enterprise/virtualkeyboard/basic/content/FloatingButton_Active.svg diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/FloatingButton_Available.svg b/examples/quick/enterprise/virtualkeyboard/basic/content/FloatingButton_Available.svg index 1178c8c6..1178c8c6 100644 --- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/FloatingButton_Available.svg +++ b/examples/quick/enterprise/virtualkeyboard/basic/content/FloatingButton_Available.svg diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/FloatingButton_Unavailable.svg b/examples/quick/enterprise/virtualkeyboard/basic/content/FloatingButton_Unavailable.svg index d8149b53..d8149b53 100644 --- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/FloatingButton_Unavailable.svg +++ b/examples/quick/enterprise/virtualkeyboard/basic/content/FloatingButton_Unavailable.svg diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/HandwritingModeButton.qml b/examples/quick/enterprise/virtualkeyboard/basic/content/HandwritingModeButton.qml index c135729b..c135729b 100644 --- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/HandwritingModeButton.qml +++ b/examples/quick/enterprise/virtualkeyboard/basic/content/HandwritingModeButton.qml diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/ScrollBar.qml b/examples/quick/enterprise/virtualkeyboard/basic/content/ScrollBar.qml index a77ff20b..a77ff20b 100644 --- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/ScrollBar.qml +++ b/examples/quick/enterprise/virtualkeyboard/basic/content/ScrollBar.qml diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextArea.qml b/examples/quick/enterprise/virtualkeyboard/basic/content/TextArea.qml index 91046582..91046582 100644 --- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextArea.qml +++ b/examples/quick/enterprise/virtualkeyboard/basic/content/TextArea.qml diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextBase.qml b/examples/quick/enterprise/virtualkeyboard/basic/content/TextBase.qml index 59777f01..59777f01 100644 --- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextBase.qml +++ b/examples/quick/enterprise/virtualkeyboard/basic/content/TextBase.qml diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextField.qml b/examples/quick/enterprise/virtualkeyboard/basic/content/TextField.qml index 8ae8fa3f..8ae8fa3f 100644 --- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextField.qml +++ b/examples/quick/enterprise/virtualkeyboard/basic/content/TextField.qml diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/demo.qrc b/examples/quick/enterprise/virtualkeyboard/basic/demo.qrc index 92258cbb..6bd24d05 100644 --- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/demo.qrc +++ b/examples/quick/enterprise/virtualkeyboard/basic/demo.qrc @@ -1,7 +1,5 @@ <RCC> <qresource prefix="/"> - <file>VirtualKeyboard-b2qt.qml</file> - <file>VirtualKeyboard.qml</file> <file>content/AutoScroller.qml</file> <file>content/ScrollBar.qml</file> <file>content/TextArea.qml</file> @@ -11,5 +9,7 @@ <file>content/FloatingButton_Active.svg</file> <file>content/FloatingButton_Available.svg</file> <file>content/FloatingButton_Unavailable.svg</file> + <file>basic.qml</file> + <file>basic-b2qt.qml</file> </qresource> </RCC> diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/main.cpp b/examples/quick/enterprise/virtualkeyboard/basic/main.cpp index 5bf6b75d..5bf6b75d 100644 --- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/main.cpp +++ b/examples/quick/enterprise/virtualkeyboard/basic/main.cpp diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard.pro b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard.pro index 8c37ce46..3ea78202 100644 --- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard.pro +++ b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs SUBDIRS += \ - virtualkeyboard + basic |